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
2,606 Commits 27 Branches 687 Tags
293a43ee27ac5ef8563d1a2cf9236795be3904e7
Commit Graph
2606 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 293a43ee27 Merge pull request #653 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-baremetal-api to release/2.4.0 
* commit '5dceb2685ca3a3c078f303ad8328c90ca43d6c8b':
  region: fix host enable not clean sched cache
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
  region: baremetal api compatible
 2018-12-04 20:44:43 +08:00
邱剑 a4ed096cf5 Merge pull request #658 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-deploy to release/2.4.0 
* commit '6b3d3a0fccb01adfbc06914d051474751daf4807':
  修复缺失的azure重置密码处理
 2018-12-04 20:43:57 +08:00
邱剑 5487b847d5 Merge pull request #657 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-resolve-qcloud-2.4.0 to release/2.4.0 
* commit 'b0bbfb0f1ad8f1c954fd000bca8ac2341fb068bb':
  避免eip为空返回其他的eip
  腾讯云导入镜像适配
 2018-12-04 20:43:27 +08:00
屈轩 6b3d3a0fcc 修复缺失的azure重置密码处理 2018-12-04 20:38:19 +08:00
屈轩 b0bbfb0f1a 解决冲突 2018-12-04 20:27:12 +08:00
邱剑 e9d5909229 Merge pull request #655 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-qcloud-eip to release/2.3.0 
* commit '07eab509aafddd72a34fa60269b0d1ccb1ded51f':
  避免eip为空返回其他的eip
 2018-12-04 20:17:46 +08:00
邱剑 db822c69db Merge pull request #654 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-image to release/2.3.0 
* commit '3fa55efe42b44b3d8a4e9406aca41c970f2836f1':
  腾讯云导入镜像适配
 2018-12-04 20:17:36 +08:00
屈轩 07eab509aa 避免eip为空返回其他的eip 2018-12-04 19:49:49 +08:00
Zexi Li 5dceb2685c region: fix host enable not clean sched cache 2018-12-04 18:52:17 +08:00
屈轩 3fa55efe42 腾讯云导入镜像适配 2018-12-04 18:50:58 +08:00
李泽玺 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
邱剑 9d8cad5af8 Merge pull request #652 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-securitygroup-create-conflicts-fix to release/2.4.0 
* commit '82bf62f489179342d3e85d8d4a5f872f120dab07':
  aws security group add tags conflicts fix
 2018-12-04 16:36:02 +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
邱剑 249a968e36 Merge pull request #649 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-securitygroup-create to release/2.3.0 
* commit 'b34cb294447f8567f8d9c066926f4ba70ed66a58':
  aws security group add tags
  aws security group fix
 2018-12-04 16:19:11 +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
邱剑 cf4725bbc5 Merge pull request #648 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-conflict-resolve-2.4.0 to release/2.4.0 
* commit '3fdc72b1647435b9914222f851faaf3ef919df98':
  修复qcloudcli eip命令参数缺失
 2018-12-04 11:44:10 +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
邱剑 59d210f5a7 Merge pull request #646 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-detach-disk to release/2.3.0 
* commit '307c08f2a0910f4e73b9cfe9904d70305125b6b7':
  修复: qcloud卸载磁盘API
 2018-12-04 09:47:06 +08:00
屈轩 307c08f2a0 修复: qcloud卸载磁盘API 2018-12-03 22:26:49 +08:00
屈轩 3518527ef3 修复qcloudcli eip命令参数缺失 2018-12-03 22:01:18 +08:00
周有松 1206dd2dcb Merge pull request #643 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-log-man to release/2.4.0 
* commit 'bae1eeaa58b129e7b4542d53a1dba3f8618b879d':
  pkg/{aws,azure,qcloud}: fix compilation
  build: parallel build of cmds
  vendor: 更新yunion.io/x/pkg/trace
  appsrv: workers: 移除调试用日志
  db_dispatcher: 移除对listFields的调试日志
  cloudcommon: models: 注册modelMan时检查crud tag值
  policy: 同步时日志调整
 2018-12-03 21:49:02 +08:00
Yousong Zhou bae1eeaa58 pkg/{aws,azure,qcloud}: fix compilation 2018-12-03 13:47:38 +00:00
Yousong Zhou bb675c553d build: parallel build of cmds 2018-12-03 13:44:46 +00:00
Yousong Zhou c356b645aa vendor: 更新yunion.io/x/pkg/trace 2018-12-03 13:44:46 +00:00
Yousong Zhou 3386c0f59e appsrv: workers: 移除调试用日志 2018-12-03 13:44:46 +00:00
Yousong Zhou 5a092d203c db_dispatcher: 移除对listFields的调试日志 2018-12-03 13:44:46 +00:00
Yousong Zhou 273f26848b cloudcommon: models: 注册modelMan时检查crud tag值 2018-12-03 13:44:46 +00:00
Yousong Zhou 801eabbe83 policy: 同步时日志调整 2018-12-03 13:44:45 +00:00
wanyaoqi ea81fa26db fix BaremetalSyncAllGuestsStatusTask 2018-12-03 20:19:20 +08:00
Zexi Li 1b3d33986b region: baremetal api compatible 2018-12-03 20:04:30 +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
邱剑 8894a6a96f Merge pull request #644 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-instance-eip to release/2.3.0 
* commit '1ff18372b784f714cdf0e92cb34e4863552871ee':
  创建主机时关联秘钥
  eip同步信息修复
 2018-12-03 19:56:35 +08:00
Zexi Li 22050bca71 region: baremetal api compatible 2018-12-03 18:51:06 +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
邱剑 ddfe759c8b Merge pull request #641 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-instance-change-config to release/2.3.0 
* commit 'ffd973d98eaa103f1b5b898b3cafb234a9d45db4':
  避免一直创建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
邱剑 5be54bad55 Merge pull request #639 in YUNIONIO/onecloud from release/2.3.0 to release/2.4.0 
* commit '37578c8a6ddaf8c0f4b6b65a9bad9552aba3b201':
  修复规则缺失优先级及描述信息
 2018-12-03 15:12:43 +08:00
邱剑 171cdcd239 Merge pull request #640 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.4.0-20181203-1 to release/2.4.0 
* commit 'b3d8936a80beeb6d4eb2f25ff0adc2c392ccde2e':
  update vendor
  修正：SPolicyCredential导致task失败
 2018-12-03 15:10:57 +08:00