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
1636 Commits
Author SHA1 Message Date
李泽玺 3f3f1701c2 Merge pull request #1 in ~LIZEXI/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-BaremetalSyncAllGuestsStatusTask to bugfix/lzx-baremetal-api 
* commit 'ea81fa26dbcb56eefe131387b2fab8c3b731029d':
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
 2018-12-04 18:09:07 +08:00
邱剑 353a4f1f2a Merge pull request #651 in YUNIONIO/onecloud from release/2.3.0 to release/2.4.0 
* commit '818c2af8c7ff09b193f8bec30b527df312102cc3':
  避免id为空时返回其他机器
  aws security group add tags
  aws security group fix
 2018-12-04 17:52:56 +08:00
TangBin 82bf62f489 aws security group add tags conflicts fix 2018-12-04 16:26:42 +08:00
邱剑 818c2af8c7 Merge pull request #650 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-qcloud-instance-filter to release/2.3.0 
* commit '3a1abae2e6c4df4f0a81602424afbc1eb1eecf1e':
  避免id为空时返回其他机器
 2018-12-04 16:24:48 +08:00
屈轩 3a1abae2e6 避免id为空时返回其他机器 2018-12-04 13:47:29 +08:00
TangBin b34cb29444 aws security group add tags 2018-12-04 12:02:58 +08:00
TangBin 70f0f743ed aws security group fix 2018-12-04 11:52:04 +08:00
屈轩 3fdc72b164 解决冲突 2018-12-04 11:42:06 +08:00
邱剑 e0fe689607 Merge pull request #645 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloudcli-eip-cli to release/2.3.0 
* commit '3518527ef3a1a70cdc53c34cb29d08cb2d93d30b':
  修复qcloudcli eip命令参数缺失
 2018-12-04 11:03:52 +08:00
邱剑 fa8d274c43 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '59d210f5a725897702c68627e8efeaeabe166b53':
  修复: qcloud卸载磁盘API
 2018-12-04 09:47:07 +08:00
屈轩 307c08f2a0 修复: qcloud卸载磁盘API 2018-12-03 22:26:49 +08:00
屈轩 3518527ef3 修复qcloudcli eip命令参数缺失 2018-12-03 22:01:18 +08:00
Yousong Zhou bae1eeaa58 pkg/{aws,azure,qcloud}: fix compilation 2018-12-03 13:47:38 +00:00
屈轩 2608e8e6b9 初始化model 2018-12-03 21:12:44 +08:00
邱剑 c33df15e64 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '8894a6a96ff84d50cdba274d2cee76b874100420':
  创建主机时关联秘钥
  eip同步信息修复
 2018-12-03 19:56:36 +08:00
屈轩 1ff18372b7 创建主机时关联秘钥 2018-12-03 18:31:29 +08:00
屈轩 2ad16ecd4f eip同步信息修复 2018-12-03 18:25:36 +08:00
邱剑 ee0df651ce Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '33ef5a50085f26c79b36210265183300f3aa996c':
  创建主机时未设置安全组信息
 2018-12-03 17:39:17 +08:00
邱剑 33ef5a5008 Merge pull request #642 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-instance-secgroup to release/2.3.0 
* commit '9dfc8a39c96496a8326d5abb7777a90ee3010b3b':
  创建主机时未设置安全组信息
 2018-12-03 17:39:16 +08:00
邱剑 24b210b91e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ddfe759c8b8e3b765fb4dab832eb7818390e0658':
  避免一直创建snapshot
  避免第一次更改完配置失败后直接返回
 2018-12-03 17:39:02 +08:00
屈轩 9dfc8a39c9 创建主机时未设置安全组信息 2018-12-03 17:22:56 +08:00
屈轩 ffd973d98e 避免一直创建snapshot 2018-12-03 16:54:46 +08:00
屈轩 5597738ecd 避免第一次更改完配置失败后直接返回 2018-12-03 16:34:44 +08:00
Qiu Jian 7aa31407a7 temp commit 2018-12-02 02:11:50 +08:00
邱剑 31f7129b50 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'bfed7c25c3035163336f4e9cad7c157b91fdbe3a':
  修复同步规则缺失问题
  磁盘名称为未命名时使用磁盘ID
  补充腾讯云webconsole
 2018-11-30 20:06:10 +08:00
邱剑 bfed7c25c3 Merge pull request #618 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-webconsole to release/2.3.0 
* commit 'd15aa96f861fd6f388c6a26f9b94c1d2f90feaf8':
  修复同步规则缺失问题
  磁盘名称为未命名时使用磁盘ID
  补充腾讯云webconsole
 2018-11-30 20:06:10 +08:00
屈轩 d15aa96f86 修复同步规则缺失问题 2018-11-30 17:44:47 +08:00
屈轩 511de80349 磁盘名称为未命名时使用磁盘ID 2018-11-30 17:15:46 +08:00
屈轩 45ddeaf084 补充腾讯云webconsole 2018-11-30 17:08:39 +08:00
邱剑 c9fb4364b4 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'de281472b02ce19a23d03cf50836d130ea67abd4':
  修复密钥对同步问题及绑定eip问题
 2018-11-30 16:41:43 +08:00
屈轩 3e6c9d7496 修复密钥对同步问题及绑定eip问题 2018-11-30 16:12:47 +08:00
邱剑 f18c9a3289 Merge pull request #605 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-use-cloudmeta to release/2.4.0 
* commit 'c8bb6ff9f713bf78918b8dcdaaffbe3e802213b6':
  fix sku nil errror
  comment fix
  bugfix
  sync skus table from cloudmeta service && aws bugfix
  remove useless method
 2018-11-30 16:11:25 +08:00
TangBin 085eebbe7e comment fix 2018-11-30 15:48:48 +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
邱剑 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
邱剑 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
邱剑 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
屈轩 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
屈轩 00cd038275 迁移storagetype到2.3.0 2018-11-29 16:27:43 +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