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
Yousong Zhou 72761eb3ac webconsole: 改进protocol检查 2018-11-30 03:07:01 +00:00
Yousong Zhou af3054ded3 httperrors: 修正InternalServerError调用 2018-11-30 03:07:01 +00:00
TangBin 36e58a813d bugfix 2018-11-30 10:26:23 +08:00
李泽玺 4c64714118 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '314f309b3553dba941e381c63ed9812f21e26845':
  climc: ingress create
 2018-11-29 23:55:15 +08:00
李泽玺 314f309b35 Merge pull request #601 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-ingress-create to release/2.3.0 
* commit 'd6ca22694d6de441b7b55e4ce095c1a4675b9cb5':
  climc: ingress create
 2018-11-29 23:55:14 +08:00
Qiu Jian 2f22ebe0a8 修正rbac，非管理模式下权限有deny, owner, user, 
guest四个级别，管理模式下，有deny,
allow两个级别。只有非管理模式下，才会应用缺省的权限设置。
 2018-11-29 23:13:53 +08:00
邱剑 d5467da0f6 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '946ba4afa0ebf3162604dc41d266e0e7318d3558':
  创建eip后等待状态为ready
 2018-11-29 21:39:13 +08:00
邱剑 946ba4afa0 Merge pull request #603 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-resource-count to release/2.3.0 
* commit 'ecc99010370fa404db6183bd2752241255486df5':
  创建eip后等待状态为ready
 2018-11-29 21:39:13 +08:00
TangBin 4cb87d487e fix conflict 2018-11-29 21:37:53 +08:00
屈轩 1ecbafc4fe 冲突解决 2018-11-29 21:33:45 +08:00
邱剑 7b36be5aad Merge pull request #600 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-storage-type to release/2.3.0 
* commit '00cd0382755459167da9f28963f4471b8155e08d':
  迁移storagetype到2.3.0
 2018-11-29 21:27:56 +08:00
TangBin d9d66329dc sync skus table from cloudmeta service && aws bugfix 2018-11-29 20:18:20 +08:00
wanyaoqi 976411c10f fix code 2018-11-29 20:04:23 +08:00
邱剑 b9edd5419e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '55f0ae9c9ee2a3b16e3588d21eb568e309d93520':
  避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败
  修复: aliyun创建主机失败时，正确返回失败信息
 2018-11-29 18:27:15 +08:00
邱剑 a081993d25 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'b9edd5419ef0f92a651dbf0f9687b3c46d44bfb9':
  避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败
  修复: aliyun创建主机失败时，正确返回失败信息
 2018-11-29 18:27:15 +08:00
邱剑 3f7ed5c9df Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'a081993d25a5f08cc6375189d690f7b423f64f49':
  避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败
  修复: aliyun创建主机失败时，正确返回失败信息
 2018-11-29 18:27:15 +08:00
屈轩 ecc9901037 创建eip后等待状态为ready 2018-11-29 18:26:30 +08:00
邱剑 30e1a922e9 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '7f82c7585431b1d3fff2167f4dbbc9965059483a':
  腾讯云返回TotalCount有可能是浮点型，统一使用Float转换
 2018-11-29 18:25:34 +08:00
邱剑 7f82c75854 Merge pull request #602 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-resource-count to release/2.3.0 
* commit '642d49f574117a56e9897a60365bea643dce89e9':
  腾讯云返回TotalCount有可能是浮点型，统一使用Float转换
 2018-11-29 18:25:33 +08:00
屈轩 642d49f574 腾讯云返回TotalCount有可能是浮点型，统一使用Float转换 2018-11-29 18:13:16 +08:00
Zexi Li d6ca22694d climc: ingress create 2018-11-29 16:55:30 +08:00
屈轩 00cd038275 迁移storagetype到2.3.0 2018-11-29 16:27:43 +08:00
wanyaoqi bcaa0bf4f6 add configure rbd storage 2018-11-29 16:00:01 +08:00
wanyaoqi 241bd748fc add misc handler, register baremetal handler; 
change the monitor request to POST
 2018-11-29 15:02:36 +08:00
屈轩 171e4f2347 避免因创建instance指定普通云硬盘时设置io优化类型实例而导致创失败 2018-11-29 14:27:01 +08:00
屈轩 4f2d759fb6 修复: aliyun创建主机失败时，正确返回失败信息 2018-11-29 14:02:35 +08:00
邱剑 eaf704450d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '7d4309fb6906fab70a1a43c8e9bbe9dc79efab0a':
  补充同步腾讯云安全组规则
  修正赋值顺序
  添加disk hypervisor
  关联安全组
  私网IP同步及storage名称统一小写
 2018-11-29 12:28:49 +08:00
邱剑 7d4309fb69 Merge pull request #590 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-nic-storage to release/2.3.0 
* commit 'fbc3fc5889cc93f96506555f9b4ea2d4ae8289b3':
  补充同步腾讯云安全组规则
  修正赋值顺序
  添加disk hypervisor
  关联安全组
  私网IP同步及storage名称统一小写
 2018-11-29 12:28:49 +08:00
屈轩 39bde25db5 冲突解决 2018-11-29 12:21:38 +08:00
wanyaoqi f7f39dd7e3 resolve conflict 2018-11-29 12:09:30 +08:00
屈轩 3d76a82d78 删除虚拟机时避免无限循环 2018-11-29 11:38:30 +08:00
邱剑 741ab54f2d Merge pull request #594 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-normal-user-usage to release/2.3.0 
* commit 'e8f647809dd31ad11abefd6e4e20e7acc19ef8d8':
  修复: 没开启 RBAC 时没有 common usage
 2018-11-28 21:33:20 +08:00
Zexi Li e8f647809d 修复: 没开启 RBAC 时没有 common usage 2018-11-28 21:30:54 +08:00
邱剑 b22c5dfc6b Merge pull request #592 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-validate-update-credential to release/2.3.0 
* commit 'cdeff01d378cf142fa3dc44bcc6a261ce8a0b4a3':
  更新密钥时检查密钥正确性
 2018-11-28 21:23:59 +08:00
周有松 57af973ea7 Merge pull request #591 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-routetables-deadcode to release/2.4.0 
* commit 'c30bd29daee2a5f4cfe2466a503f1de01d98adf2':
  routetables: 移除调试用不可达代码
 2018-11-28 21:15:49 +08:00
屈轩 cdeff01d37 更新密钥时检查密钥正确性 2018-11-28 19:33:36 +08:00
屈轩 fbc3fc5889 补充同步腾讯云安全组规则 2018-11-28 18:43:09 +08:00
Yousong Zhou c30bd29dae routetables: 移除调试用不可达代码 2018-11-28 10:12:49 +00:00
屈轩 48974ebd48 修正赋值顺序 2018-11-28 16:52:06 +08:00
屈轩 87a1cce5eb 添加disk hypervisor 2018-11-28 16:50:20 +08:00
屈轩 46a4cbd4a4 关联安全组 2018-11-28 16:47:04 +08:00
屈轩 396da0de61 私网IP同步及storage名称统一小写 2018-11-28 16:04:22 +08:00
Yousong Zhou 5d2ef3ab41 treewide: httperrors: 使用http.ResposneWriter时保留msg fmt 2018-11-28 07:39:55 +00:00
Yousong Zhou 49382934e5 treewide: 保留httperrors的格式 2018-11-28 07:33:22 +00:00
Yousong Zhou 151da754d3 dispatchers: 使用httperrors.NewResourceNotFoundError2() 2018-11-28 07:26:15 +00:00
Yousong Zhou 191dd8259a httperrors: 增加NewResourceNotFoundError2(keyword, id) 2018-11-28 07:26:09 +00:00
Yousong Zhou afba04ee3d mcclient: options: servers: server-monitor支持--admin选项 2018-11-28 07:26:09 +00:00
wanyaoqi bdb60e3acd resolve conflict 2018-11-28 15:23:56 +08:00
wanyaoqi eb57a4c531 add guest actions 2018-11-28 11:23:58 +08:00
李泽玺 1946accc28 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'e49180a3f5c6d1d0ab919ac7b5d28306754daf6f':
  climc: support job, statefulset, secret create
 2018-11-28 10:47:35 +08:00