opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,876 Commits 27 Branches 687 Tags
32e23a3fb4ef0cd65b0efd6119d570b017ddfe7b
Commit Graph
3876 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 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
邱剑 a2414dddb9 Merge pull request #976 in YUNIONIO/onecloud from ~NINGYU/onecloud:feature/ningyu-meter-alert to release/2.6.0 
* commit 'f6a8b9de6d0dc9f3409aa4a3f3082744a978235b':
  feat: 添加余额和日消费报警功能
  feat: 添加余额和日消费报警功能
 2019-01-26 14:21:43 +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
万垚奇 e502a1579f Merge pull request #983 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-server-no-os-type to release/2.4.0 
* commit '0f0698ea7ee830cce4dddde0a2e89884e70631f4':
  修正：旧的服务器没有os_type字段
 2019-01-26 10:46:48 +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
万垚奇 ba7ae5641b Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '84e33c9148454b354af68f0fd7ce9f16627734c9':
  fix disk-list
 2019-01-25 17:38:45 +08:00
万垚奇 84e33c9148 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'ca97105c95898f9ae357ca07b98d8caf9ca6a027':
  fix disk-list
 2019-01-25 17:38:45 +08:00
万垚奇 ca97105c95 Merge pull request #977 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-climc to release/2.4.0 
* commit '65ac44f3e96e0f685f7482eb59d5abf1e6c13f1c':
  fix disk-list
 2019-01-25 17:38:44 +08:00
wanyaoqi 65ac44f3e9 fix disk-list 2019-01-25 17:29:26 +08:00
邱剑 1175646e4d Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '155858f89e6f50df2864ea2430984c254d70ecf4':
  添加腾讯云创建机器时校验数据盘大小
 2019-01-25 17:14:18 +08:00
邱剑 155858f89e Merge pull request #975 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-validate-create-guest-disk-size to release/2.5.0 
* commit 'aaa6ac23ea08b8657017045d0d4ccf0f744360a8':
  添加腾讯云创建机器时校验数据盘大小
 2019-01-25 17:14:18 +08:00
ningyu f6a8b9de6d Merge branch 'feature/ningyu-meter-alert' of ssh://git.yunion.io/~ningyu/onecloud into feature/ningyu-meter-alert 2019-01-25 16:14:32 +08:00
ningyu 0e26b9be17 feat: 添加余额和日消费报警功能 2019-01-25 16:09:42 +08:00
ningyu 0650a315bc feat: 添加余额和日消费报警功能 2019-01-25 16:05:56 +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
邱剑 b440465685 Merge pull request #974 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-image to release/2.6.0 
* commit '64b9454f9ac30893f43eef57248d80e1928ebb7a':
  image status 统一
 2019-01-25 14:53:27 +08:00
屈轩 64b9454f9a image status 统一 2019-01-25 13:31:42 +08:00
周有松 b0257cef1d Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '700d9229c7f41ef919d0ccb22a543370933fba0d':
  修复lb同步时的一些小问题
 2019-01-25 12:42:56 +08:00
周有松 700d9229c7 Merge pull request #962 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-lb-sync to release/2.5.0 
* commit 'f6481b73633741cead155b97d2e01c7ee3b2221c':
  修复lb同步时的一些小问题
 2019-01-25 12:42:55 +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
万垚奇 94375a89a6 Merge pull request #971 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-server-detach-gpu to release/2.4.0 
* commit 'd41d722343f9053a82769ef707595e02536881e2':
  修正: server 卸载 gpu 不生效
 2019-01-25 11:23:58 +08:00
屈轩 6ae236e650 阿里云创建时校验云盘大小 2019-01-25 11:23:19 +08:00
Zexi Li d41d722343 修正: server 卸载 gpu 不生效 2019-01-25 11:06:52 +08:00