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
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
邱剑 f64d2ebc64 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '703aaf694bdb0f6dcd0f89bf9db915469326e29a':
  region: host ZoneId and IsBaremetal allow update
 2019-01-28 19:30:46 +08:00
万垚奇 06446f7783 Merge pull request #35 in ~WANYAOQI/onecloud from ~LIZEXI/onecloud:feature/lzx-baremetal-agent to feature/host-baremetal-v2 
* commit '475c71a3bf5723cb84d566dca05d1bc4bea57e42':
  baremetal: ipmitool passowrd EscapeEchoString
 2019-01-28 18:42:38 +08:00
Zexi Li 475c71a3bf baremetal: ipmitool passowrd EscapeEchoString 2019-01-28 18:41:00 +08:00
wanyaoqi d18f0dbedf add hostmetrics 2019-01-28 18:10:57 +08:00
万垚奇 a8242c6de3 Merge pull request #33 in ~WANYAOQI/onecloud from feature/wyq/host-server-v2 to feature/host-baremetal-v2 
* commit 'cc409c01bbe250938fe5f845043d6e0eaa1b18ce':
  add hostmetrics
  add bsd raw socket code
 2019-01-28 18:06:42 +08:00
wanyaoqi cc409c01bb add hostmetrics 2019-01-28 17:56:19 +08:00
Zexi Li 0c409ae3ab region: host ZoneId and IsBaremetal allow update 2019-01-28 14:18:31 +08:00
李泽玺 a80b2a515c Merge pull request #992 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-resolve-2.6.0 to release/2.6.0 
* commit 'c1e450f38c6043eec331ab7fafd88ffe0acd70a6':
  修复opentack同步的问题
  climc命令行参数向后兼容，否则yunion-test脚本失败
 2019-01-28 11:21:30 +08:00
Zexi Li dd4c1fe0ae types struct 符合命名规范 2019-01-28 10:06:56 +08:00
Qiu Jian e8445c0d45 修正：httperror没有正确parse错误格式 2019-01-27 18:50:29 +08:00
Qiu Jian 4cd39a70c0 1. 
增加server-change-ipaddr接口，允许在运行和关机更换主机的IP地址。
2. 允许主机加入一个network多次（目前允许2次）
 2019-01-27 00:30:43 +08:00
邱剑 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
屈轩 c1e450f38c 解决冲突 2019-01-26 18:47:47 +08:00
邱剑 a05b1e817e Merge pull request #980 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-make-climc-backward-compatible to release/2.5.0 
* commit '399fbc9bd5893e3136c3641d75dad22b11d97918':
  climc命令行参数向后兼容，否则yunion-test脚本失败
 2019-01-26 18:01: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
屈轩 881ed73ce5 修复opentack同步的问题 2019-01-26 16:45:37 +08:00
Zexi Li d1cd4f3c6d Merge remote-tracking branch 'wyq/feature/host-baremetal-v2' into feature/lzx-baremetal-agent 2019-01-26 16:42:11 +08:00
Zexi Li af143ae2ae 修正：centos 7宿主机格式化的ext4和xfs能够被centos 6虚拟机挂载 2019-01-26 16:40:02 +08:00
wanyaoqi 5f46e7c044 add bsd raw socket code 2019-01-26 16:12:01 +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
wanyaoqi f91f33d696 fix code 2019-01-26 15:55:48 +08:00
wanyaoqi e8306bf602 fix code 2019-01-26 15:51:15 +08:00
wanyaoqi 79f030acf0 dep add gopsutil/mem 2019-01-26 15:45:32 +08:00
wanyaoqi 133f338111 fix dhcp server 2019-01-26 15:44:58 +08:00
Zexi Li 8711154aab baremetal: quit signal handle 2019-01-26 15:44:39 +08:00
Zexi Li a57f8e46be baremetal: quit signal handle 2019-01-26 15:39:31 +08:00
wanyaoqi 0e86ae858c fix dhcp server 2019-01-26 15:04:44 +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
邱剑 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
邱剑 ff3f65d821 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e80ce6369eeeea100b3c48810a837828580f9d3d':
  避免同步过来的安全组规则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
邱剑 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
邱剑 89254b6b96 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'ea34b35e52db342d007f672638170bf16ae7930f':
  默认删除routetables
 2019-01-26 12:12:55 +08:00
wanyaoqi dd7ec6518b gendoc 2019-01-26 11:58:45 +08:00
wanyaoqi 4e77136adf remove jsonutils NewPair 2019-01-26 11:53:21 +08:00
屈轩 c442c275e1 避免同步过来的安全组规则ip地址为nil 2019-01-26 11:48:02 +08:00
wanyaoqi 31940fcad6 fix qmp montior cmd 2019-01-26 11:40:47 +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
万垚奇 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
万垚奇 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
万垚奇 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 399fbc9bd5 climc命令行参数向后兼容，否则yunion-test脚本失败 2019-01-26 03:31:26 +08:00
Qiu Jian f2d3460bad update make fmt 2019-01-26 02:20:38 +08:00