opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,073 Commits 30 Branches 712 Tags
dc2a6d53fe9a0f7935aa0118f229fb31c8332f88
Commit Graph
3303 Commits
Author SHA1 Message Date
邱剑 dc2a6d53fe Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'bfb7d69eab18488ead051755bad361bb67e0123f':
  补充esix缺失的ValidateDiskSize
  避免PerformCreateEip失败后guest状态一直不变
 2019-03-18 10:31:57 +08:00
屈轩 7bb46e5990 冲突解决 2019-03-18 10:25:39 +08:00
邱剑 53feaef241 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f6fedf390f43e2ea1c0ef55b67f00bc7bdd5dfad':
  fix: 1. remote file will retry glance if peer url is not available 2. ssh authorized keys ends with \n
 2019-03-18 09:04:53 +08:00
邱剑 f6fedf390f Merge pull request #1269 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-remote-file-support-retry-glance to release/2.6.0 
* commit 'deafebd3e0ce4b2fd92d35739a5816aba5817871':
  fix: 1. remote file will retry glance if peer url is not available 2. ssh authorized keys ends with \n
 2019-03-18 09:04:52 +08:00
邱剑 458f73e0f7 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '91f58349cbe1756a22de95758d1ef93d7243ad63':
  避免PerformCreateEip失败后guest状态一直不变
 2019-03-18 08:58:50 +08:00
邱剑 91f58349cb Merge pull request #1260 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-create-eip to release/2.4.0 
* commit 'b5a8bb1f6091b4b8075037d96b4966626006a419':
  避免PerformCreateEip失败后guest状态一直不变
 2019-03-18 08:58:49 +08:00
邱剑 b2105ea5a7 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '25465096a7d8b3c4d4b5935bf0b3e42c75b4b2cc':
  补充esix缺失的ValidateDiskSize
 2019-03-18 08:56:36 +08:00
屈轩 0aebfd37a5 补充esix缺失的ValidateDiskSize 2019-03-17 14:43:32 +08:00
Yousong Zhou 4f7a4177ac Merge remote-tracking branch 'origin/release/2.6.0' into feature/yousong-lbagent-managed 2019-03-17 02:35:09 +00:00
邱剑 019df55b82 Merge pull request #1258 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-lbagent-managed to release/2.6.0 
* commit '1b879d1b2409a6b1b56d67fa23b4ef53617383a4':
  lbagent: try using unicast vrrp
  lbagent: report ip, ha_state, version
  lbagent: always reload on startup
  lbagent: making agent params with reflect
  netutils2: add MyIP() for finding default source ip
 2019-03-17 00:04:37 +08:00
Qiu Jian deafebd3e0 fix: 1. remote file will retry glance if peer url is not available 2. 
ssh authorized keys ends with \n
 2019-03-16 21:34:07 +08:00
屈轩 36c90af374 腾讯云项目使用自身的id 2019-03-15 21:02:08 +08:00
邱剑 8be49a8d69 Merge pull request #1263 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/do-not-sync-status-on-guest-delete to release/2.6.0 
* commit '389d64d92b955ef04d29abe56086cd323a0334fc':
  guest do not sync status on guest delete
 2019-03-15 20:21:05 +08:00
邱剑 b48dc22b3d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '8be49a8d69072e8afe18fd5cb8d8536345257e10':
  guest do not sync status on guest delete
 2019-03-15 20:21:05 +08:00
Yousong Zhou 1b879d1b24 lbagent: try using unicast vrrp 2019-03-15 12:11:22 +00:00
Yousong Zhou 33f568717b lbagent: report ip, ha_state, version 2019-03-15 12:11:22 +00:00
Yousong Zhou 41bcd59cc1 lbagent: always reload on startup 
Instead of at the next resync tick
 2019-03-15 12:11:22 +00:00
Yousong Zhou fdb0571c5c lbagent: making agent params with reflect 2019-03-15 12:11:22 +00:00
Yousong Zhou 15e4708f71 netutils2: add MyIP() for finding default source ip 2019-03-15 12:11:22 +00:00
邱剑 fb73a69036 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'df9d1cd92cf4507292a57dccabf4c680efc7db4a':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:50 +08:00
邱剑 ce319b767c Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'f813e663c6299df93fed445bf69779224777bab3':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:49 +08:00
邱剑 f813e663c6 Merge pull request #1262 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-eip-name to release/2.4.0 
* commit 'd63c000b787e845a65762c6eb2b488c4eec7a44b':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:49 +08:00
邱剑 df9d1cd92c Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'ce319b767c0fa3a31ecadafd17a1b62c3e046197':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:49 +08:00
wanyaoqi 389d64d92b guest do not sync status on guest delete 2019-03-15 15:49:53 +08:00
邱剑 21fdf7bd1a Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '7f8ea1b23e99bbe92d24a1b749a11f529a02724a':
  避免腾讯云使用以/开头的密码
 2019-03-15 14:52:11 +08:00
邱剑 7f8ea1b23e Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '7974b7127f490c40b19b7fb20621b74df1162f77':
  避免腾讯云使用以/开头的密码
 2019-03-15 14:52:11 +08:00
邱剑 7974b7127f Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '3beb002e5d749fe4bfdd9964f73ee352b5e83702':
  避免腾讯云使用以/开头的密码
 2019-03-15 14:52:10 +08:00
屈轩 d63c000b78 避免腾讯云eip长度超过限制 2019-03-15 14:32:16 +08:00
屈轩 c40dc1edcd 避免腾讯云使用以/开头的密码 2019-03-15 14:23:19 +08:00
Zexi Li 902d50d4b3 climc: override-pending-delete add '-f' short token 2019-03-15 12:06:30 +08:00
屈轩 b5a8bb1f60 避免PerformCreateEip失败后guest状态一直不变 2019-03-15 11:57:35 +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
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
邱剑 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
周有松 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