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
1313 Commits
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
屈轩 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
邱剑 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
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
屈轩 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
屈轩 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
邱剑 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
邱剑 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
屈轩 580202e8be 解决冲突 2018-11-15 18:16:53 +08:00
周有松 ea3aa1bef5 Merge pull request #509 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-dnsrecords-is_public to release/2.3.0 
* commit '5753f119b9312563d67f655cf19b78dfa3866536':
  climc: dnsrecords: allow create and list with is_public
  cloudcommon: sharablevirtual: set is_public as create:admin_optional
 2018-11-15 15:33:12 +08:00
Yousong Zhou 5753f119b9 climc: dnsrecords: allow create and list with is_public 2018-11-15 07:18:50 +00:00
Yousong Zhou ab7a3f744e cloudcommon: sharablevirtual: set is_public as create:admin_optional 2018-11-15 07:18:50 +00:00
wanyaoqi 2e19f3032d fix request host error 2018-11-15 13:50:08 +08:00
屈轩 ce70ab3300 补充Azure创建快照功能 2018-11-15 12:01:22 +08:00
李泽玺 ac620132dd Merge pull request #506 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-pv-sched to release/2.3.0 
* commit '8d7360298f3c4fcd03b44719f519082c3ad118e7':
  schedule k8s local volume
  region-dns: use k8s.SKubeClusterManager
 2018-11-15 11:50:24 +08:00
Zexi Li 8d7360298f schedule k8s local volume 2018-11-15 11:49:19 +08:00
邱剑 acb34e697b Merge pull request #505 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181115-2.3.0 to release/2.3.0 
* commit 'bfdb74bcfd087abe38c7e13bee095cbf42634107':
  避免更新Azure disk名称
 2018-11-15 11:16:20 +08:00
邱剑 73e753beb7 Merge pull request #498 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-request-optimization to release/2.3.0 
* commit '5e19f0b0c1e04521a4002e4a2be79b4929b91fac':
  优化腾讯云请求失败重试
 2018-11-15 11:13:56 +08:00
Qiu Jian bfdb74bcfd Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181115-2.3.0 
Conflicts:
	pkg/compute/hostdrivers/base.go
 2018-11-15 11:12:07 +08:00
邱剑 44801052b5 Merge pull request #500 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-disk-name-change to release/2.2.0 
* commit 'b4c3ce139fa2a2f6a7c932ac2bee0b9c36b3651f':
  避免更新Azure disk名称
 2018-11-15 11:08:22 +08:00
邱剑 b8e79d8675 Merge pull request #503 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-templateid-sync to release/2.3.0 
* commit '97f1d1c150f93292234761642e7863b19214aa58':
  避免覆盖本地templateId
 2018-11-15 11:08:03 +08:00
屈轩 97f1d1c150 避免覆盖本地templateId 2018-11-15 11:01:33 +08:00