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,260 Commits 30 Branches 712 Tags
38da40461d4a1bce81e5113baafc8951207e9f76
Commit Graph
1092 Commits
Author SHA1 Message Date
邱剑 2310be389b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '430df17dd3cefe0f25328ce69bf8d8b0d0e95253':
  fix: SyncOnce should invalidate policy cache
  fix: refine policy match conditions
  minor updates
  fix: simplify rbac policy condition to match projects and roles
 2019-03-21 11:31:11 +08:00
邱剑 430df17dd3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '07304221c0e4f4fa1f75438d24a8feece7202c9f':
  fix: SyncOnce should invalidate policy cache
  fix: refine policy match conditions
  minor updates
  fix: simplify rbac policy condition to match projects and roles
 2019-03-21 11:31:11 +08:00
邱剑 07304221c0 Merge pull request #1293 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-rbac-simplify-condition to release/2.6.0 
* commit '78faed91a4ee0ebda6608f55bc6ae924195df0e3':
  fix: SyncOnce should invalidate policy cache
  fix: refine policy match conditions
  minor updates
  fix: simplify rbac policy condition to match projects and roles
 2019-03-21 11:31:11 +08:00
Qiu Jian 78faed91a4 fix: SyncOnce should invalidate policy cache 2019-03-21 11:29:30 +08:00
邱剑 5de1178b97 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'd7c587bf4b4ffe939a408707225af52c2859ab33':
  fix: 1. vmware detch disk logic error 2. host add storage commit_rate 3. host enable netif failed if a fake ipaddr is given
 2019-03-21 11:00:13 +08:00
Qiu Jian cc30b585e0 fix: refine policy match conditions 2019-03-21 10:16:55 +08:00
Qiu Jian 58bb26c77f Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190321-2.7.0 
Conflicts:
	pkg/compute/guestdrivers/base.go
 2019-03-21 01:09:08 +08:00
Qiu Jian 06ae94ebe3 fix: simplify rbac policy condition to match projects and roles 2019-03-21 01:03:51 +08:00
Qiu Jian a93968e0d2 fix: 1. vmware detch disk logic error 2. host add storage commit_rate 3. 
host enable netif failed if a fake ipaddr is given
 2019-03-20 14:37:37 +08:00
Zexi Li 076ad985cc move consts to apis 2019-03-20 12:08:15 +08:00
邱剑 a868005689 Merge pull request #1245 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.8.0 
* commit 'b67eb79797040b211d0b2ab4bb2f8988d06c78d4':
  fix cpu set
  fix cgroups
 2019-03-18 22:08:27 +08:00
邱剑 7d1d851244 Merge pull request #1255 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/fix-package-dependence to release/2.8.0 
* commit '53ece34f3b424d4430b1198ea06a66456a4a9a12':
  merge const pkg from cloudcommon to compute
  fix package dependence
 2019-03-18 17:18:35 +08:00
邱剑 ad8e990f61 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '0c2efb51a141bb65541ed66b8b670d94093dd3d4':
  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 11:42:29 +08:00
wanyaoqi 53ece34f3b merge const pkg from cloudcommon to compute 2019-03-17 11:21:17 +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
邱剑 11c097854c Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '0eb7d4ca07e3079e7275b0e26279347dc1942fd2':
  腾讯云项目使用自身的id
 2019-03-15 21:29:35 +08:00
屈轩 36c90af374 腾讯云项目使用自身的id 2019-03-15 21:02:08 +08:00
Yousong Zhou 15e4708f71 netutils2: add MyIP() for finding default source ip 2019-03-15 12:11:22 +00:00
邱剑 ff82a405d2 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'fb73a690365b5d5cedc010ec5849d897dabadb03':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:50 +08:00
邱剑 fb73a69036 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'df9d1cd92cf4507292a57dccabf4c680efc7db4a':
  避免腾讯云eip长度超过限制
 2019-03-15 17:40:50 +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
邱剑 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
邱剑 9364e2c99a Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '21fdf7bd1a9f663167ea66a6c8753bc6f63cd30b':
  避免腾讯云使用以/开头的密码
 2019-03-15 14:52:12 +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
wanyaoqi b67eb79797 fix cpu set 2019-03-15 12:20:30 +08:00
wanyaoqi e0ee2b8c59 fix package dependence 2019-03-15 11:45:56 +08:00
邱剑 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 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
周有松 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
屈轩 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
邱剑 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
屈轩 37519b64e1 补充azure city信息 2019-03-14 15:05:32 +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