opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
邱剑 5cbc5e3566 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'd37fecd3cc3d4d1382930c71d33cae80498089f3':
  fix: qcloud startVM do not retry implicitly
  minor fixes
  make capabilities optional
  not allow to delete cloud-account and provider when auto sync enabled
  minor fixes
  fix: cleanup project sync codes
 2019-03-15 09:54:37 +08:00
Qiu Jian 8ee64bf416 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options 
Conflicts:
	pkg/compute/options/options.go
 2019-03-15 09:48:55 +08:00
邱剑 d37160a90f Merge pull request #1246 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/fix-capabilities to release/2.6.0 
* commit 'f3554fe30f3b1fe30a1ea832190f7d2d4747a384':
  make capabilities optional
 2019-03-14 23:12:41 +08:00
屈轩 ec764d2d1d 兼容disk json参数 2019-03-14 20:26:58 +08:00
Qiu Jian ea291b5700 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options 
Conflicts:
	pkg/util/qcloud/instance.go
 2019-03-14 18:31:02 +08:00
邱剑 3a414183da Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '63ff2eff9b2e547e4781119a0affe2534335924a':
  腾讯云续费实例没有ClientToken参数
 2019-03-14 18:28:42 +08:00
邱剑 268866f8a2 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'ffb25c7121c513a7e610433dd90a4345998609a1':
  腾讯云续费实例没有ClientToken参数
 2019-03-14 18:28:41 +08:00
邱剑 0205a6fc4a Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '268866f8a23c8b8ec353406f7c5cdb55fd966cfb':
  腾讯云续费实例没有ClientToken参数
 2019-03-14 18:28:41 +08:00
邱剑 63ff2eff9b Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '0205a6fc4a9b956bf41bc6d4745cefc94e2e2ecb':
  腾讯云续费实例没有ClientToken参数
 2019-03-14 18:28:41 +08:00
周有松 457054dd7a Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '8da10ea93623f8e192330236106128b26742e8fa':
  fix: support batch update joint module
 2019-03-14 17:45:56 +08:00
周有松 8da10ea936 Merge pull request #1251 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-batch-update-joint-module-support to release/2.7.0 
* commit '4d888f172542b5fe645e8cef36258150120d546e':
  fix: support batch update joint module
 2019-03-14 17:45:56 +08:00
周有松 5be0284d08 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'e5985755f79e14de0b6e33d77b3ead65c6b09f7b':
  补充azure city信息
 2019-03-14 17:45:46 +08:00
周有松 e5985755f7 Merge pull request #1249 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-geographic-info to release/2.7.0 
* commit '37519b64e121992e0c8f268704c7ca292cdfa4fd':
  补充azure city信息
 2019-03-14 17:45:46 +08:00
周有松 d5d03b28c5 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '29cf401e60a243d3af6184b6190d09f67f9c263d':
  optimize huawei renew
  wait huawei instance renew sucess
  huawei instance renew bugfix
 2019-03-14 17:45:26 +08:00
周有松 29cf401e60 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'b161f5af44c54836730adedfb9b70c77184f8e92':
  optimize huawei renew
  wait huawei instance renew sucess
  huawei instance renew bugfix
 2019-03-14 17:45:26 +08:00
周有松 b161f5af44 Merge pull request #1234 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-renew-instance to release/2.6.0 
* commit '5624a294daf9b9fb85d76c5523b7fed939accfbf':
  optimize huawei renew
  wait huawei instance renew sucess
  huawei instance renew bugfix
 2019-03-14 17:45:25 +08:00
周有松 48609ef921 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'dc45d8a30aaf0b469c004e9d085450bd5fe396c1':
  fix: issues due to move of skustools to models at 2.7.0
 2019-03-14 17:44:48 +08:00
屈轩 8dde1cae02 腾讯云续费实例没有ClientToken参数 2019-03-14 16:55:32 +08:00
Qiu Jian a9bbdddc15 fix: qcloud startVM do not retry implicitly 2019-03-14 16:51:34 +08:00
Qiu Jian bc50179bbe Merge branch 'hotfix/qj-resolve-conflict-20190314-2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options 2019-03-14 16:21:39 +08:00
Qiu Jian f935155b5b fix: issues due to move of skustools to models at 2.7.0 2019-03-14 16:06:33 +08:00
周有松 29827aa70d Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '5ac89a79127872e2904eaf7b81b772d1348d654e':
  add skus util function test
  soldout skus fix & add more comment
 2019-03-14 15:49:46 +08:00
周有松 5ac89a7912 Merge pull request #1250 in YUNIONIO/onecloud from release/2.6.0 to release/2.7.0 
* commit '3c8d6a7337633fcc3afa45e664d7f627e37dabb6':
  add skus util function test
  soldout skus fix & add more comment
 2019-03-14 15:49:46 +08:00
屈轩 5d5cd9833b 允许只传key进行过滤 2019-03-14 15:43:46 +08:00
屈轩 46d5120a35 取消key以_开头key限制 2019-03-14 15:43:45 +08:00
屈轩 9bcaf1ec84 metadata返回列表使用复数 2019-03-14 15:43:45 +08:00
屈轩 2d0cc14835 支持server disk 过滤 2019-03-14 15:43:21 +08:00
屈轩 703ce13f67 支持标签 2019-03-14 15:42:46 +08:00
邱剑 4cac5015d0 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '542520e55be30848f79ebfeb86573a05f584b273':
  treewide: 改进opslog记录update diff
 2019-03-14 15:40:54 +08:00
Yousong Zhou 4e3925be5b Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-update-diffs-270 2019-03-14 07:39:01 +00:00
邱剑 3c8d6a7337 Merge pull request #1248 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-conflicts-fix-release2.6.0-314 to release/2.6.0 
* commit '9464f71ed2a609398c71897e9649108bdaeda382':
  add skus util function test
  soldout skus fix & add more comment
 2019-03-14 15:38:20 +08:00
Qiu Jian 4d888f1725 fix: support batch update joint module 2019-03-14 15:26:49 +08:00
屈轩 37519b64e1 补充azure city信息 2019-03-14 15:05:32 +08:00
TangBin 9464f71ed2 fix conflicts 2019-03-14 12:33:53 +08:00
Qiu Jian 60ea022492 minor fixes 2019-03-14 12:19:03 +08:00
wanyaoqi f3554fe30f make capabilities optional 2019-03-14 12:13:37 +08:00
Qiu Jian 6e8e415235 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options 2019-03-14 12:11:54 +08:00
wanyaoqi 44f9b4c818 fix cgroups 2019-03-14 11:57:56 +08:00
Qiu Jian 62a8e1eb7f not allow to delete cloud-account and provider when auto sync enabled 2019-03-14 11:08:56 +08:00
TangBin 5624a294da optimize huawei renew 2019-03-14 11:05:37 +08:00
TangBin 173098a998 fix conflicts 2019-03-14 10:53:52 +08:00
Qiu Jian fc8d0c450a minor fixes 2019-03-14 09:48:38 +08:00
Qiu Jian e74f31b7c0 fix: cleanup project sync codes 2019-03-14 09:46:29 +08:00
Yousong Zhou 098d62bdc5 treewide: 改进opslog记录update diff 
action为ACT_UPDATE，仅当len(UpdateDiffs) > 0时才记录
 2019-03-13 14:20:54 +00:00
邱剑 8c9f71ae0d Merge pull request #1240 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-goimports-280 to release/2.8.0 
* commit '0eee9eb674ff5c49774b4482a75b4e80d6b852b7':
  treewide: 280: group imports with goimports
 2019-03-13 21:40:34 +08:00
邱剑 5620e66d8f Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '7b30e84ae87a92ecd5c8f211bf454cd3461dec29':
  避免openstack创建机器失败后长时间等待
 2019-03-13 21:37:33 +08:00
邱剑 7b30e84ae8 Merge pull request #1235 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-create-error to release/2.7.0 
* commit '13f36146fa7656422d3edbe5c66911a30a3987d6':
  避免openstack创建机器失败后长时间等待
 2019-03-13 21:37:32 +08:00
Yousong Zhou 0eee9eb674 treewide: 280: group imports with goimports 
./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg}
 2019-03-13 13:37:16 +00:00
邱剑 1042edc5ac Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '8ffa110034e7bb680a6bba83c89dee1a355903e7':
  treewide: group imports with goimports
  fix disk resize
 2019-03-13 21:36:22 +08:00
Yousong Zhou 4c82dae39b Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-goimports-270 2019-03-13 13:33:51 +00:00