opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 23:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,879 Commits 30 Branches 714 Tags
c97fd8240926efe6eb02767ba092beccfbab00a6
Commit Graph
1374 Commits
Author SHA1 Message Date
邱剑 c97fd82409 Merge pull request #973 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-aws-image-fetch-info to release/2.6.0 
* commit '878bc69358620916304e5c28d6b15d7c20d88756':
  minor updates
  改进：对Aws系统镜像分类处理
 2019-01-26 20:10:17 +08:00
邱剑 32e23a3fb4 Merge pull request #979 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-allow-kvm-running-change-disk to release/2.6.0 
* commit 'f2d3460bad989229d1584a6c3b6beab00681bd10':
  update make fmt
  改进：允许kvm虚拟机在不关机状态下调整磁盘
 2019-01-26 18:00:46 +08:00
周有松 5562e8a528 Merge pull request #939 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-lb-create to release/2.6.0 
* commit '409b376ebdd13086d2a5a7462ab076827dff0f25':
  修正udp,tcp后端服务器组id异常
  添加监听同步配置操作
  统一LoadBalancer函数大小写问题
  添加region driver
 2019-01-26 15:57:03 +08:00
邱剑 50eca7811b Merge pull request #970 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-create-vm to release/2.6.0 
* commit '0a9db10e8356780e7192de1efbe118b3d8f7d0d2':
  优化创建虚机结构
  优化虚机创建方法
 2019-01-26 14:22:03 +08:00
邱剑 e0e7744915 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'ff3f65d821a921cb35d47893c4d0efb4e26151cb':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:43 +08:00
邱剑 ff3f65d821 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e80ce6369eeeea100b3c48810a837828580f9d3d':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:42 +08:00
邱剑 e80ce6369e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '44536b25b0a1f8e6e5663522649f9a4eda4de02e':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:42 +08:00
邱剑 44536b25b0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6ce5fe078802ced35986f7d443b29642b4a17342':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:42 +08:00
邱剑 6ce5fe0788 Merge pull request #986 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-rule-ip-sync-nil to release/2.2.0 
* commit 'c442c275e1b4c8f20b29e124d05c0a8b93cebddd':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:41 +08:00
邱剑 eb721eead2 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '89254b6b96ed0ae3b342673ce091d978734c2924':
  默认删除routetables
 2019-01-26 12:12:56 +08:00
邱剑 89254b6b96 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'ea34b35e52db342d007f672638170bf16ae7930f':
  默认删除routetables
 2019-01-26 12:12:55 +08:00
邱剑 ea34b35e52 Merge pull request #978 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-vpc-delete to release/2.4.0 
* commit 'f0deb530e511c54db2a2f7495a6b2749c6c8a1a5':
  默认删除routetables
 2019-01-26 12:12:55 +08:00
屈轩 c442c275e1 避免同步过来的安全组规则ip地址为nil 2019-01-26 11:48:02 +08:00
万垚奇 d48c4cd6a3 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '46a15c784a5fbf0d269caffd7152dae8fa003232':
  server rebuild root状态没有立即设置，导致yunion-test脚本失败
 2019-01-26 10:47:09 +08:00
万垚奇 46a15c784a Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '196fefd30e30c23f7bfe6b55cc25b22f1ec13609':
  server rebuild root状态没有立即设置，导致yunion-test脚本失败
 2019-01-26 10:47:08 +08:00
万垚奇 196fefd30e Merge pull request #982 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-server-rebuild-root-status-not-set-immediately to release/2.4.0 
* commit 'ffd02bfd7f49a6327a8ad2828a6097ff7bf71855':
  server rebuild root状态没有立即设置，导致yunion-test脚本失败
 2019-01-26 10:47:08 +08:00
万垚奇 2ca0c88850 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '8ee6b55c4418c6089483d7dadbcc926ca167a6ee':
  修正：旧的服务器没有os_type字段
 2019-01-26 10:46:50 +08:00
万垚奇 8ee6b55c44 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e502a1579fcbca49160db3161fa14dac82607d78':
  修正：旧的服务器没有os_type字段
 2019-01-26 10:46:49 +08:00
Qiu Jian 0f0698ea7e 修正：旧的服务器没有os_type字段 2019-01-26 10:42:40 +08:00
Qiu Jian ffd02bfd7f server rebuild root状态没有立即设置，导致yunion-test脚本失败 2019-01-26 03:34:20 +08:00
Qiu Jian f2d3460bad update make fmt 2019-01-26 02:20:38 +08:00
Qiu Jian c6eaa4ad9b 改进：允许kvm虚拟机在不关机状态下调整磁盘 2019-01-26 02:17:59 +08:00
屈轩 f0deb530e5 默认删除routetables 2019-01-25 21:04:04 +08:00
邱剑 1175646e4d Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '155858f89e6f50df2864ea2430984c254d70ecf4':
  添加腾讯云创建机器时校验数据盘大小
 2019-01-25 17:14:18 +08:00
屈轩 aaa6ac23ea 添加腾讯云创建机器时校验数据盘大小 2019-01-25 15:43:43 +08:00
屈轩 409b376ebd 修正udp,tcp后端服务器组id异常 2019-01-25 15:00:45 +08:00
屈轩 53b03c1d59 添加监听同步配置操作 2019-01-25 15:00:05 +08:00
屈轩 dc81eb1d5e 统一LoadBalancer函数大小写问题 2019-01-25 14:57:57 +08:00
屈轩 2df78f917f 添加region driver 2019-01-25 14:54:27 +08:00
邱剑 fc0af0d6f9 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'ab46f9fcdf511801a0b3205456a51f77dfbd316c':
  阿里云创建时校验云盘大小
 2019-01-25 14:54:14 +08:00
邱剑 ab46f9fcdf Merge pull request #972 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-create-validate-disk-size to release/2.5.0 
* commit '6ae236e6501f63ff26e364b6e408c769a5f45f11':
  阿里云创建时校验云盘大小
 2019-01-25 14:54:14 +08:00
邱剑 2031d63401 Merge pull request #963 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-server-create-with-eip to release/2.6.0 
* commit '4c422533236babb6ebad3b8083d5cebd67d0092f':
  fix eip-dissociate cmd options
  改进：1. 创建主机时可以绑定指定eip，或者新建eip并且绑定。2. 取消绑定eip时候可以自动删除eip
 2019-01-25 14:53:38 +08:00
Qiu Jian 96b81f40c1 改进：对Aws系统镜像分类处理 2019-01-25 12:34:07 +08:00
万垚奇 88a85075d2 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'e477d9e8c8e49ce8f39709815c1bc202d2bf9bcb':
  修正: server 卸载 gpu 不生效
 2019-01-25 11:23:59 +08:00
万垚奇 e477d9e8c8 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '94375a89a6e78d495717dfb637c6894631aac9ab':
  修正: server 卸载 gpu 不生效
 2019-01-25 11:23:59 +08:00
屈轩 6ae236e650 阿里云创建时校验云盘大小 2019-01-25 11:23:19 +08:00
Zexi Li d41d722343 修正: server 卸载 gpu 不生效 2019-01-25 11:06:52 +08:00
屈轩 0a9db10e83 优化创建虚机结构 2019-01-24 21:48:13 +08:00
屈轩 bf89aa274f 优化虚机创建方法 2019-01-24 15:05:02 +08:00
邱剑 d71f94c71a Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6ebc5d9f02f123e62fc0d2b65d1f2f884c0d806b':
  disk-list filter public & private cloud
 2019-01-24 14:50:25 +08:00
邱剑 6ebc5d9f02 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '03499f7ccc21a131f2da7a7f7cfdf1ac8c0e5ce0':
  disk-list filter public & private cloud
 2019-01-24 14:50:25 +08:00
wanyaoqi a64b8e15cd reslove conflict 2019-01-24 14:28:56 +08:00
万垚奇 1295bc5ec2 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'ac2263a6918d47308892d960177ebedefd59a640':
  disk-list filter public & private cloud
 2019-01-24 13:31:55 +08:00
万垚奇 ac2263a691 Merge pull request #966 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/disk-list to release/2.2.0 
* commit 'e5d4060f1b682c4f681f1263001c49325210c8d3':
  disk-list filter public & private cloud
 2019-01-24 13:31:55 +08:00
邱剑 383194aa6b Merge pull request #964 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-loadbalancer-network to release/2.5.0 
* commit 'd9e92edade392b88a653e1371243631a652ffc4b':
  避免同步时出现多个loadbalancer network
 2019-01-24 12:19:24 +08:00
邱剑 05f1a1c5b7 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '383194aa6b10150b916a86480b9b5fdff01fda1b':
  避免同步时出现多个loadbalancer network
 2019-01-24 12:19:24 +08:00
邱剑 0e8d737312 Merge pull request #949 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-huawei-stage-2 to release/2.6.0 
* commit '9007c966cf69947f95343ea1b1c33d1d5ff32df3':
  fix comment
  add instance price key
  add more comment
  huaweicli support unsubscirbe instance
  huawei support stage 2
 2019-01-24 11:57:21 +08:00
TangBin 9007c966cf fix comment 2019-01-24 11:56:25 +08:00
wanyaoqi e5d4060f1b disk-list filter public & private cloud 2019-01-24 11:00:52 +08:00
邱剑 fd6260aeb8 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '3c48686318d232bf4d13f610861f0b7f6f9206cf':
  add cmd loadbalancer-network-list
  minor fixes
  修正：由于阿里云网络与SNAT关联，导致无法删除
 2019-01-23 19:49:27 +08:00