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
1,879 Commits 30 Branches 714 Tags
c62424aa2cd323a2bcd65f144ccba2b8d669cd93
Commit Graph
1879 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiu Jian c62424aa2c change yunionroot => cloudroot 2018-11-17 12:54:56 +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
李泽玺 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
李泽玺 2805e93d9e Merge pull request #531 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-add-sched-policy-show-cmd to release/2.3.0 
* commit '3a04d0c3d312a842a2379713068158c925c46310':
  增加 sched-policy-show command
 2018-11-17 10:54:32 +08:00
Qiu Jian 3a04d0c3d3 增加 sched-policy-show command 2018-11-17 08:40:19 +08:00
邱剑 b4747c7a6f Merge pull request #530 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.3.0 to release/2.3.0 
* commit '0770e52eeaa60af2e8f9fa3ff9e1472053210347':
  重复使用已分配的未使用网卡
  去除不需要接口
  避免公有云找不到对应的cloudregion
 2018-11-16 23:14:44 +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
屈轩 8d46d503d0 解决冲突 2018-11-16 22:02:52 +08:00
屈轩 270f3fe3c3 解决冲突 2018-11-16 21:56:25 +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
邱剑 d91bb3c38a Merge pull request #524 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-network to release/2.2.0 
* commit '54dda9496ffdefc5f331d1b0d8bd3c203542583b':
  重复使用已分配的未使用网卡
 2018-11-16 21:46:17 +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
邱剑 641a637e37 Merge pull request #522 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-schedtag-usage to release/2.3.0 
* commit 'f65e031597ad86224320a699850022807c52feab':
  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
邱剑 2453fadf99 Merge pull request #521 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-host-name to release/2.2.0 
* commit '110fdc1d24cc0816bcc4b406340751ea70b4c0be':
  去除主机名中文字符
 2018-11-16 17:24:04 +08:00
邱剑 a291be31d4 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '2453fadf997916972d5e118aef5c0bd9b36e9471':
  去除主机名中文字符
 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
邱剑 4890c6aea2 Merge pull request #520 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-host-name to release/2.2.0 
* commit 'de45f88830a3d549ca45167876c2a7c75b186acb':
  Azure主机名称带上region信息,避免名称重复
 2018-11-16 17:20:45 +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
屈轩 2e868ed7c1 避免公有云找不到对应的cloudregion 2018-11-16 16:09:02 +08:00
邱剑 dcbe81a7ab Merge pull request #516 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-validate to release/2.3.0 
* commit '4c4b93aa4b67470dabb2fccdc2400f64cc315de9':
  避免公有云账号认证失败后返回系统登录界面
 2018-11-16 14:55:04 +08:00
屈轩 4c4b93aa4b 避免公有云账号认证失败后返回系统登录界面 2018-11-16 14:53:06 +08:00
邱剑 0e4bdc92f2 Merge pull request #515 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-rbac-20181115 to release/2.3.0 
* commit '4034ee517e55bda87a71d81d59d3b770474e3792':
  make fmt
  skip cloutpost
  make rbac default enabled
  增加user/guest两个权利等级
  minor fixes
 2018-11-16 14:41:55 +08:00
Yousong Zhou 6d27d05ae7 networks: add "port_used" field to details listing 2018-11-16 04:15:49 +00:00
Qiu Jian 4034ee517e make fmt 2018-11-16 01:43:01 +08:00
Qiu Jian ca73b5442e skip cloutpost 2018-11-16 01:35:33 +08:00
Qiu Jian c434cd5669 make rbac default enabled 2018-11-16 01:33:18 +08:00
Qiu Jian 2734d2f5db 增加user/guest两个权利等级 2018-11-16 01:32:01 +08:00
Qiu Jian ca0e3977c7 minor fixes 2018-11-15 23:41:04 +08:00
邱剑 0befda1779 Merge pull request #514 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.2.0 to release/2.2.0 
* commit '4035cbe3630f185402944f2f211d20bf578a91dc':
  使用调度标签限制调度创建经典实例
 2018-11-15 21:15:20 +08:00
邱剑 7c1b77a5fc Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '0befda17797db0ee1bceb624cdf4bbd79069f8d6':
  使用调度标签限制调度创建经典实例
 2018-11-15 21:15:20 +08:00
屈轩 4035cbe363 使用调度标签限制调度创建经典实例 2018-11-15 21:13:16 +08:00
邱剑 b3221c24bf Merge pull request #513 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webssh-xterm to release/2.3.0 
* commit '174d13274388df3697d5aa7a0bab03e491249b97':
  替换使用xterm-256color
 2018-11-15 20:15:30 +08:00
邱剑 609d0a9975 Merge pull request #512 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webssh-env to release/2.2.0 
* commit '7c15b8d2fb7268165f3c69a3c8d2fae17552a081':
  替换使用xterm-256color
 2018-11-15 20:15:17 +08:00
邱剑 5f9bd7faf8 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '609d0a997590c192151d85346c6a1a849c571cd9':
  替换使用xterm-256color
 2018-11-15 20:15:17 +08:00
屈轩 174d132743 替换使用xterm-256color 2018-11-15 20:12:44 +08:00
屈轩 7c15b8d2fb 替换使用xterm-256color 2018-11-15 20:10:59 +08:00
邱剑 475db4c635 Merge pull request #511 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.3.0 to release/2.3.0 
* commit '580202e8bea4e46b0c102ad7e145ab45d33c9e56':
  补充Azure创建快照功能
 2018-11-15 18:18:23 +08:00
屈轩 580202e8be 解决冲突 2018-11-15 18:16:53 +08:00
邱剑 4bd537b6aa Merge pull request #507 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-snapshot-create to release/2.2.0 
* commit 'ce70ab3300283f64277fe2e8adaffb3c2e98dbd1':
  补充Azure创建快照功能
 2018-11-15 18:11:53 +08:00