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
2,135 Commits 30 Branches 714 Tags
b7af004286a7108b01ac5f23e6bc535880d3cf18
Commit Graph
1419 Commits
Author SHA1 Message Date
TangBin b7af004286 fix confilct 2018-11-19 15:08:04 +08:00
邱剑 b286520af4 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'da6110e4f73add7f4f51bd429653bdedfb1bf635':
  服务未注册时，尝试注册服务
 2018-11-19 13:43:49 +08:00
邱剑 da6110e4f7 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '8512446cc4b651671df88ec40aa3291ccf99075b':
  服务未注册时，尝试注册服务
 2018-11-19 13:43:49 +08:00
屈轩 db0f7656aa 服务未注册时，尝试注册服务 2018-11-19 10:28:40 +08:00
邱剑 2d4f610d4e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'd5fdd3e78ba5c319cbe80d95f445e84ff0aefbde':
  刷新scheduler缓存
 2018-11-17 17:45:21 +08:00
邱剑 d5fdd3e78b Merge pull request #537 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-clear-scheduler-cache to release/2.3.0 
* commit '04917c93453febb0843a178ac9f1b3c9327fe3f8':
  刷新scheduler缓存
 2018-11-17 17:45:21 +08:00
邱剑 a43933395d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '1d2f15d91c87fc9303c9e9e4737f39d8051b4c2c':
  虚拟机启动时如果已经启动，会丢失start的osplog事件
 2018-11-17 17:34:08 +08:00
Qiu Jian 532f5ae1af 虚拟机启动时如果已经启动，会丢失start的osplog事件 2018-11-17 17:27:05 +08:00
TangBin 6b14c8d95f remove useless log 2018-11-17 16:21:31 +08:00
TangBin a49747bebe rebuild root fix 2018-11-17 16:07:06 +08:00
邱剑 2fe7eb84c6 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '81e17c25aba3d579c7528b06785b3efc204f875d':
  取消创建公有云vpc限制
 2018-11-17 15:55:19 +08:00
邱剑 81e17c25ab Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '0e53e16d4dca4c1d1ca3a5ae35fda919e5a1e56d':
  取消创建公有云vpc限制
 2018-11-17 15:55:19 +08:00
屈轩 c6c1b17c3e 取消创建公有云vpc限制 2018-11-17 15:53:11 +08:00
屈轩 04917c9345 刷新scheduler缓存 2018-11-17 15:31:30 +08:00
邱剑 4017b4d8dc Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'a9e9cb48c35ee0371419e96689fca01ccebdb7a7':
  ”刚导入进来的新订阅默认状态未connected“
 2018-11-17 14:34:15 +08:00
屈轩 aff50b0de4 ”刚导入进来的新订阅默认状态未connected“ 2018-11-17 14:28:26 +08:00
邱剑 079ab3cd20 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'e17ce4f78dcb36b3f85c76347aa09f12af3be115':
  azure使用统一登录用户名
 2018-11-17 13:04:04 +08:00
屈轩 fc0e60c5ec azure使用统一登录用户名 2018-11-17 13:02:10 +08:00
邱剑 4292c68b67 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0a8d2b532e3200958e4515c995fdb7f17ce962de':
  change yunionroot => cloudroot
 2018-11-17 12:56:19 +08:00
Qiu Jian c62424aa2c change yunionroot => cloudroot 2018-11-17 12:54:56 +08:00
邱剑 8c5120e943 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '2aa68a16928163aed0e26c9aa70cbb344eec0629':
  使用系统密钥
 2018-11-17 12:16:27 +08:00
邱剑 2aa68a1692 Merge pull request #533 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webconsole-keypair to release/2.3.0 
* commit '8e9105d11540c96f5e41419cd1cbcb9a5c088678':
  使用系统密钥
 2018-11-17 12:16:27 +08:00
屈轩 8e9105d115 使用系统密钥 2018-11-17 12:15:31 +08:00
李泽玺 114d3aef26 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '8bc8f2a7546fc489982e6ecd4482d65a0294bbcf':
  loadbalancers: exclude pending_deleted when checking uniqueness
  loadbalancerlisteners: more complete acl fields validation
 2018-11-17 10:55:15 +08:00
李泽玺 8bc8f2a754 Merge pull request #528 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lblis-clear-acl_id to release/2.3.0 
* commit 'ddbbb24fcf4bb95fa32eb4f33fd989d198a36ed8':
  loadbalancers: exclude pending_deleted when checking uniqueness
  loadbalancerlisteners: more complete acl fields validation
 2018-11-17 10:55:14 +08:00
TangBin ab4bb74e17 make fmt 2018-11-17 10:26:19 +08:00
TangBin bc1fae8ebb rebuild root disk 2018-11-17 10:25:25 +08:00
邱剑 f6338b4af8 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b4747c7a6fe91cf6ca28b85bb6c8a47df73d764a':
  重复使用已分配的未使用网卡
  去除不需要接口
  避免公有云找不到对应的cloudregion
 2018-11-16 23:14:45 +08:00
屈轩 0770e52eea 解决冲突 2018-11-16 23:08:29 +08:00
邱剑 5a507dd0a9 Merge pull request #518 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-snapshot-region-id to release/2.2.0 
* commit '503bec34c86f2b00ed54736ec988ab5a4f11bc9e':
  去除不需要接口
  避免公有云找不到对应的cloudregion
 2018-11-16 23:03:30 +08:00
Yousong Zhou ddbbb24fcf loadbalancers: exclude pending_deleted when checking uniqueness 2018-11-16 14:51:07 +00:00
Yousong Zhou 97162f5965 loadbalancerlisteners: more complete acl fields validation 2018-11-16 14:51:06 +00:00
邱剑 2f1a74852d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '1c14ea16fd4b669afd4339618c6e3963d14f27d4':
  解决冲突
 2018-11-16 21:47:23 +08:00
邱剑 1c14ea16fd Merge pull request #526 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-resolve-conflict-azure-network-2.3.0 to release/2.3.0 
* commit '5568a009d18656804c8249b1b21b617fdb7e119c':
  解决冲突
 2018-11-16 21:47:22 +08:00
屈轩 54dda9496f 重复使用已分配的未使用网卡 2018-11-16 21:40:57 +08:00
屈轩 5568a009d1 解决冲突 2018-11-16 21:37:02 +08:00
周有松 35e65898b4 Merge pull request #523 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lblis-clear-acl_id to release/2.3.0 
* commit '76c60926c6ee6f77fe9303ee1c6fb38b1319783f':
  loadbalancerlisteners: clear out acl_id when acl_status=off
 2018-11-16 21:09:35 +08:00
周有松 06adb33c75 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '35e65898b4f9600edc09fc1cadb698e106912e23':
  loadbalancerlisteners: clear out acl_id when acl_status=off
 2018-11-16 21:09:35 +08:00
邱剑 13da8d331b Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '641a637e37d8fefdfaabd27b628397807f38b2ff':
  usage: fix schedtag usage panic
 2018-11-16 20:36:00 +08:00
Yousong Zhou 76c60926c6 loadbalancerlisteners: clear out acl_id when acl_status=off 2018-11-16 12:18:28 +00:00
Zexi Li f65e031597 usage: fix schedtag usage panic 2018-11-16 18:43:50 +08:00
屈轩 503bec34c8 去除不需要接口 2018-11-16 17:59:45 +08:00
邱剑 a291be31d4 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '2453fadf997916972d5e118aef5c0bd9b36e9471':
  去除主机名中文字符
 2018-11-16 17:24:04 +08:00
邱剑 835de026fc Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'a291be31d4b41d691683bbf6e01c1114a4d036e2':
  去除主机名中文字符
 2018-11-16 17:24:04 +08:00
屈轩 110fdc1d24 去除主机名中文字符 2018-11-16 17:23:03 +08:00
邱剑 917345a4f7 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '4890c6aea26a731596f11a6368ea7436dac17231':
  Azure主机名称带上region信息,避免名称重复
 2018-11-16 17:20:46 +08:00
邱剑 19d4bdfb71 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '917345a4f77b7d374379d81fd6c8aead071f00a6':
  Azure主机名称带上region信息,避免名称重复
 2018-11-16 17:20:46 +08:00
屈轩 de45f88830 Azure主机名称带上region信息,避免名称重复 2018-11-16 17:16:58 +08:00
邱剑 e5d0321695 Merge pull request #517 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-networks-port-used to release/2.3.0 
* commit '6d27d05ae78de72e58e5d29e76f99330dd68bcac':
  networks: add "port_used" field to details listing
 2018-11-16 16:52:03 +08:00
邱剑 cc752b2c34 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'e5d032169564456b182648fdf39e969bee65bdb8':
  networks: add "port_used" field to details listing
 2018-11-16 16:52:03 +08:00