opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-02 04:02:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,032 Commits 30 Branches 712 Tags
ea291b5700ec44de3152afad4eec5b598f072721
Commit Graph
3269 Commits
Author SHA1 Message Date
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
邱剑 63ff2eff9b Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '0205a6fc4a9b956bf41bc6d4745cefc94e2e2ecb':
  腾讯云续费实例没有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
邱剑 268866f8a2 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'ffb25c7121c513a7e610433dd90a4345998609a1':
  腾讯云续费实例没有ClientToken参数
 2019-03-14 18:28:41 +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
周有松 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
周有松 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
屈轩 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
周有松 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
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
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
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
邱剑 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 4c82dae39b Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-goimports-270 2019-03-13 13:33:51 +00:00
屈轩 13f36146fa 避免openstack创建机器失败后长时间等待 2019-03-13 21:32:26 +08:00
邱剑 223c9f6461 Merge pull request #1224 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-goimports to release/2.6.0 
* commit '8fe4f2ec98110dece5412f7980a0085725b7e993':
  treewide: group imports with goimports
 2019-03-13 21:01:20 +08:00
邱剑 6a5923693f Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'df6bc80c892d9329cab4d21a009aee890a43f16a':
  fix disk resize
 2019-03-13 20:56:16 +08:00
邱剑 df6bc80c89 Merge pull request #1228 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-disk-resize-backport-from-2.8 to release/2.6.0 
* commit '2d863896854beee27168f5dd2f00aafb9dbe1131':
  fix disk resize
 2019-03-13 20:56:16 +08:00
邱剑 4d931b2035 Merge pull request #1225 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recode-cloud-account-create-options to release/2.7.0 
* commit '533a629dd43571fa0152cec5d3205e9cd6172a32':
  make fmt
  fix: recode cloud-account-create commands, easier to use
 2019-03-13 20:14:48 +08:00
Yousong Zhou 8fe4f2ec98 treewide: 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 10:46:12 +00:00
邱剑 4cf5c87a5a Merge pull request #1229 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-use-agent-manageruri-to-visit-agent to release/2.6.0 
* commit '64bb1b15db4e6ff7c5afb10059b6bdcbf7b54c10':
  fix: use agent manageruri instance of endpoint to visit agents
 2019-03-13 17:39:09 +08:00
邱剑 6828da3fee Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4cf5c87a5a373f79f2604b512df9b5479f61b9d5':
  fix: use agent manageruri instance of endpoint to visit agents
 2019-03-13 17:39:09 +08:00
TangBin caf6540e61 wait huawei instance renew sucess 2019-03-13 16:55:01 +08:00
Qiu Jian 4e9eab8ee7 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190313-2.7.0 
Conflicts:
	pkg/cloudcommon/db/taskman/tasks.go
 2019-03-13 16:32:18 +08:00
邱剑 9448fde22d Merge pull request #1222 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-msyd-bugfix-20190312 to release/2.6.0 
* commit '1ca00c14c6d0e3e9342f8e2a0a5586f6b2fc7a2c':
  fix: find image peer host with local storage only
  fix: filter cached images by storage status
  remove debug logs
  fix: usage port state not correct
  fix: 1. usage hide system servers 2. host undo convert shows wrong status
 2019-03-13 16:28:32 +08:00
TangBin ebe6e378e1 huawei instance renew bugfix 2019-03-13 15:51:21 +08:00
TangBin a32ddd4364 add skus util function test 2019-03-13 15:33:11 +08:00
TangBin d9baf4c462 soldout skus fix & add more comment 2019-03-13 12:09:59 +08:00
Qiu Jian 64bb1b15db fix: use agent manageruri instance of endpoint to visit agents 2019-03-13 11:52:10 +08:00
wanyaoqi 2d86389685 fix disk resize 2019-03-13 11:42:06 +08:00
Qiu Jian 7e606b64d3 fix: cherry-pick hotfix/qj-recover-image-properties-at-startup 2019-03-13 10:31:44 +08:00
Qiu Jian af100016be fix: try to recover image properties(mindisk, format) at startup 2019-03-13 10:12:12 +08:00
Qiu Jian 533a629dd4 make fmt 2019-03-13 01:47:28 +08:00
Qiu Jian 300f4e5163 fix: recode cloud-account-create commands, easier to use 2019-03-13 01:42:07 +08:00
Qiu Jian 1ca00c14c6 fix: find image peer host with local storage only 2019-03-12 21:48:40 +08:00
Qiu Jian cb9fea2286 fix: filter cached images by storage status 2019-03-12 18:24:12 +08:00