opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,217 Commits 27 Branches 687 Tags
e95e1ac0814cb0bc21ff0b9b0aaf35b24ef5641d
Commit Graph
1555 Commits
Author SHA1 Message Date
屈轩 e95e1ac081 冲突解决 2018-12-17 12:16:35 +08:00
邱剑 b797c4a2dc Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7bab92d0114a5152e5f5488bb2a84c1a0d404f2a':
  同步完成后清理调度缓存
 2018-12-17 12:13:35 +08:00
屈轩 b50cd5f667 同步完成后清理调度缓存 2018-12-17 12:02:57 +08:00
屈轩 e61d1d17df 冲突解决 2018-12-16 13:07:47 +08:00
屈轩 9e4fbfa943 统一代码,添加日志 2018-12-15 13:45:00 +08:00
屈轩 251765d4b6 未关联主机的安全组规则可以同步 2018-12-15 13:26:16 +08:00
Yousong Zhou d661881262 loadbalancercertificates: 变更Certificate字段为list:"user" 2018-12-15 04:47:36 +00:00
Yousong Zhou 40ed5bc5a6 loadbalancercertificates: 变更证书fingerprint字段名和格式 2018-12-15 04:47:36 +00:00
Zexi Li d98ac09833 region: host schedtag GetShortDesc panic 2018-12-14 15:58:15 +08:00
Zexi Li 55a8c869f7 fix: gpu server not work 2018-12-13 11:53:54 +08:00
屈轩 064d082ef2 解决冲突 2018-12-12 21:23:23 +08:00
邱剑 516c39a614 Merge pull request #740 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit '1a7283b8470f3d39c00df1b3bcf8d74f28ede890':
  loadbalancers: 使用ApplyModelFilters()
  validators: 添加ApplyModelFilters()
  loadbalancerlisteners: 改正update enable_http2
  lbagent: 仅处理manager_id为空的API对象
  gofmt
 2018-12-12 21:14:07 +08:00
Zexi Li 5f3d452017 region: server deploy 和 save-image 操作后自动重启 2018-12-12 20:51:18 +08:00
屈轩 7a3ddc7caf 避免同步cache中的安全组 2018-12-12 17:01:14 +08:00
Yousong Zhou 1a7283b847 loadbalancers: 使用ApplyModelFilters() 2018-12-12 08:50:57 +00:00
Yousong Zhou 35384160ce validators: 添加ApplyModelFilters() 2018-12-12 08:50:57 +00:00
Yousong Zhou c6dd234676 loadbalancerlisteners: 改正update enable_http2 2018-12-12 08:50:57 +00:00
Yousong Zhou 4f107ee02c lbagent: 仅处理manager_id为空的API对象 
当前还没有manager_id字段，先留出
 2018-12-12 08:47:04 +00:00
Yousong Zhou 1d013215b3 gofmt 2018-12-12 08:47:04 +00:00
Yousong Zhou 432bab6fa5 loadbalancerlisteners: 改正rps update 2018-12-12 07:35:40 +00:00
邱剑 ec71bc2fe9 Merge pull request #725 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-lb-ratelimit to release/2.3.0 
* commit '5564929e349985f4c0ddbd07f13ebf7aa23f9dbc':
  loadbalancers: 增加rps限速支持
  loadbalancers: 清理监听选项名
  loadbalancers: 移除Bandwidth字段
 2018-12-12 15:32:47 +08:00
邱剑 fad903ce33 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '3774ae91700bc04b21440aaf9816d77b1a93e0e5':
  project删除bufix
 2018-12-12 15:11:28 +08:00
邱剑 29300936d4 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'fad903ce33e7f2da0727b6f2823db500bc06e30a':
  project删除bufix
 2018-12-12 15:11:28 +08:00
邱剑 5e94bdded3 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '29300936d4065aac04587a3d3ffc5de0e143c8c7':
  project删除bufix
 2018-12-12 15:11:28 +08:00
唐斌 c37f162182 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'eb4dcfb63cfdafcdd733b70eadb3ab0e204c009f':
  修复capabilities接口hypervisors为空引发的异常
  修复capabilities接口hypervisors为空引发的异常
 2018-12-12 15:09:52 +08:00
TangBin c3a5afd88e 修复capabilities接口hypervisors为空引发的异常 2018-12-12 15:09:03 +08:00
TangBin 68249b00d7 project删除bufix 2018-12-12 15:06:09 +08:00
TangBin 953da6e348 修复capabilities接口hypervisors为空引发的异常 2018-12-12 14:41:55 +08:00
Yousong Zhou 5564929e34 loadbalancers: 增加rps限速支持 2018-12-12 03:44:30 +00:00
Yousong Zhou 93e1e7799e loadbalancers: 清理监听选项名 2018-12-11 14:32:27 +00:00
Yousong Zhou 58aca9ea9e loadbalancers: 移除Bandwidth字段 
未在使用，且名称太泛，不便于日后扩展维护
 2018-12-11 14:32:27 +00:00
邱剑 f537b04ff3 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '8a4badaa095960557acc3bb40314384083314f79':
  阿里云错误处理
 2018-12-11 20:22:45 +08:00
邱剑 ed401039b3 Merge pull request #719 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-aliyun-error-code to release/2.1.0 
* commit 'cea2fcb6f38532c37d7ddadcd936b4b70b06b81c':
  阿里云错误处理
 2018-12-11 20:22:44 +08:00
邱剑 8a4badaa09 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'ed401039b38d16546d674b07869e92e40f20ceeb':
  阿里云错误处理
 2018-12-11 20:22:44 +08:00
唐斌 c280c5d3e0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '33e73560b2b17c15701deef474c9106d929e8559':
  delete project bugfix
 2018-12-11 19:48:40 +08:00
唐斌 3ad1342f4d Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'f3cc732c6c29278877e3d99c795d4b26c428f343':
  delete project bugfix
 2018-12-11 19:48:40 +08:00
唐斌 33e73560b2 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '3ad1342f4ddd79eb3f71ff372150f5b72913b336':
  delete project bugfix
 2018-12-11 19:48:40 +08:00
TangBin b3644003a8 delete project bugfix 2018-12-11 19:47:16 +08:00
屈轩 cea2fcb6f3 阿里云错误处理 2018-12-11 19:43:33 +08:00
邱剑 7feab1d5d0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '77427a2d1ba197fc8781a21a5263dd230fb82fa3':
  bugfix
 2018-12-11 10:35:18 +08:00
邱剑 fcdc89610a Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '12776a4d48148c6c9eba301abf47756a31ff72c0':
  bugfix
 2018-12-11 10:35:18 +08:00
邱剑 77427a2d1b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'fcdc89610a9e9c2bb4e33d624fa780e3efdde8a0':
  bugfix
 2018-12-11 10:35:18 +08:00
TangBin f4f117813a bugfix 2018-12-11 10:33:31 +08:00
邱剑 2b183d5dd8 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '45936a8f4e9a068324863121fc650b1592b08a72':
  磁盘删除失败处理
 2018-12-10 20:01:20 +08:00
邱剑 2566cb54b4 Merge pull request #708 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-delete to release/2.1.0 
* commit '113af069fee4b217a775590929537042c41e2c28':
  磁盘删除失败处理
 2018-12-10 20:01:19 +08:00
邱剑 45936a8f4e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '2566cb54b410c4a64e1a2266c8db7d8ba4dd8519':
  磁盘删除失败处理
 2018-12-10 20:01:19 +08:00
屈轩 113af069fe 磁盘删除失败处理 2018-12-10 17:18:59 +08:00
屈轩 02a10173a7 添加腾讯云计费信息 2018-12-10 14:58:31 +08:00
屈轩 44196113d7 补充eip修改带宽验证代码 2018-12-08 18:36:14 +08:00
邱剑 6c79c66ef8 Merge pull request #697 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-validate-eip-change-bandwidth to release/2.2.0 
* commit 'c7166bb713fc5580ea45e6053901c55ff1a83304':
  验证eip更改带宽
 2018-12-08 18:25:51 +08:00