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,901 Commits 27 Branches 687 Tags
34ed406dddbd325bd9fdd08fa217fa2de6bc7f6d
Commit Graph
2901 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
TangBin 34ed406ddd add clean invalid sku job 2018-12-13 17:44:48 +08:00
邱剑 28fdd6437a Merge pull request #727 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-vmware-vcenter-test to release/2.4.0 
* commit 'e7b978955c3a17712095964102afad558c68d2da':
  set cmtbound for storage & cpu & memory
  修正：由于datastore url信息不一致导致通过vcenter创建主机失败
 2018-12-12 23:35:53 +08:00
Qiu Jian e7b978955c set cmtbound for storage & cpu & memory 2018-12-12 23:34:52 +08:00
Qiu Jian 8c597cf135 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-vmware-vcenter-test 2018-12-12 23:29:16 +08:00
邱剑 9f2075f896 Merge pull request #726 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-region-geographicinfo to release/2.4.0 
* commit '46aaba247414d502bf38764af7347966e0c51b46':
  make fmt
  1. 对disk/elasticip/networks/snapshot/storages/vpc/wire/routetable/servers等支持manager/account/provider过滤查询 2. 详情增加SCloudProviderInfo信息
  增加：1. region的区域信息 2. 完善host的公有云账号信息
 2018-12-12 23:26:46 +08:00
Qiu Jian 46aaba2474 make fmt 2018-12-12 23:24:34 +08:00
邱剑 bdbfee8f2d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '34aa2a5ff89b1d5397a545cf6cd5c37996b4c3a7':
  climc: 在stderr输出错误信息
 2018-12-12 23:08:19 +08:00
邱剑 34aa2a5ff8 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6c77688637d179ea1e23a0ddd2380e875dc0cc1f':
  climc: 在stderr输出错误信息
 2018-12-12 23:08:19 +08:00
邱剑 6c77688637 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '694310f14423a0ca9678ad19ec20bc2aef193669':
  climc: 在stderr输出错误信息
 2018-12-12 23:08:19 +08:00
邱剑 694310f144 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'd45c1061ebcf445d7e2374a847b75b966b74c77a':
  climc: 在stderr输出错误信息
 2018-12-12 23:08:18 +08:00
邱剑 d45c1061eb Merge pull request #749 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-climc-stderr to release/2.0.0 
* commit '56370457ddc4360d7db19311736b55e5f0478ca0':
  climc: 在stderr输出错误信息
 2018-12-12 23:08:18 +08:00
Yousong Zhou 56370457dd climc: 在stderr输出错误信息 2018-12-12 15:02:26 +00:00
Qiu Jian 4ede254c1d Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-region-geographicinfo 2018-12-12 22:56:19 +08:00
Qiu Jian 8f11b765d9 1. 
对disk/elasticip/networks/snapshot/storages/vpc/wire/routetable/servers等支持manager/account/provider过滤查询
2. 详情增加SCloudProviderInfo信息
 2018-12-12 22:53:13 +08:00
邱剑 e3d3926ab9 Merge pull request #748 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-routetables-purge to release/2.4.0 
* commit '91f61d6b7e2397839a38ac8e14f681e3e275abb3':
  guests: 允许purge预付费虚机记录
  routetables: routetable-purge支持
  routetables: routetable-list --manager <provider-id>支持
 2018-12-12 22:33:39 +08:00
Yousong Zhou 91f61d6b7e guests: 允许purge预付费虚机记录 2018-12-12 14:20:43 +00:00
Yousong Zhou 010cafa4c5 routetables: routetable-purge支持 2018-12-12 14:20:43 +00:00
Yousong Zhou b736983fe9 routetables: routetable-list --manager <provider-id>支持 2018-12-12 14:20:43 +00:00
邱剑 3e71b2247f Merge pull request #737 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-multi-secgroup to release/2.4.0 
* commit '9473893d77e51ca7af7db607b7b154f36063cf77':
  冲突解决
  支持一次性绑定多个安全组
 2018-12-12 21:52:05 +08:00
屈轩 9473893d77 冲突解决 2018-12-12 21:37:03 +08:00
屈轩 6590a00f2a 冲突解决 2018-12-12 21:36:17 +08:00
邱剑 c82e4da35f Merge pull request #746 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-resolve-2.3.0 to release/2.3.0 
* commit '064d082ef27a6920307691d28e46a67916703700':
  避免同步cache中的安全组
 2018-12-12 21:24:22 +08:00
邱剑 c1fca5e883 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'c82e4da35fde0bba71279e66f11ef8128aade241':
  避免同步cache中的安全组
 2018-12-12 21:24:22 +08:00
屈轩 064d082ef2 解决冲突 2018-12-12 21:23:23 +08:00
邱剑 54e3d40a2e Merge pull request #739 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-sync to release/2.2.0 
* commit '7a3ddc7caf8afe83657797d21995ed20b5e42501':
  避免同步cache中的安全组
 2018-12-12 21:17:21 +08:00
邱剑 90b250c2da Merge pull request #717 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-create-disk-by-snapshot to release/2.4.0 
* commit 'ad2de3384697067d40a68e06e7870c2a9e9612b3':
  fix code
  add snapshot reference count, fix code
  server create disk by snapshot, mount snapshot by fusefs
 2018-12-12 21:15:19 +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
邱剑 f26634c6ee Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '516c39a6144b5558505fa6669d70a8cf4ad3b496':
  loadbalancers: 使用ApplyModelFilters()
  validators: 添加ApplyModelFilters()
  loadbalancerlisteners: 改正update enable_http2
  lbagent: 仅处理manager_id为空的API对象
  gofmt
 2018-12-12 21:14:07 +08:00
邱剑 52ff998385 Merge pull request #742 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-undo-recycle-duplicate-external-id to release/2.4.0 
* commit '33e0269d081ab3a0afe7b2501ec032b502ef95ec':
  minor fixes
  修正：prepaid recycle host的storage driver设置为Linux
  修正：host-undo-recycle fail
 2018-12-12 21:03:20 +08:00
邱剑 13ecb06f9c Merge pull request #738 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-always-enable-sched-policy to release/2.4.0 
* commit '09750de93436edac99890b252b7b4e1f0cd5b12b':
  总是允许使用调度标签，无论公有云还是私有云
 2018-12-12 21:02:34 +08:00
邱剑 4ee5b2f092 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '4db82c95608cea2856ca7485637af1dd6bba03fc':
  region: server deploy 和 save-image 操作后自动重启
 2018-12-12 21:01:48 +08:00
邱剑 4db82c9560 Merge pull request #744 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-deploy-autostart to release/2.3.0 
* commit '5f3d45201715f2a34b58e86836f67edd202e489a':
  region: server deploy 和 save-image 操作后自动重启
 2018-12-12 21:01:47 +08:00
Qiu Jian 33e0269d08 minor fixes 2018-12-12 21:01:02 +08:00
Zexi Li 5f3d452017 region: server deploy 和 save-image 操作后自动重启 2018-12-12 20:51:18 +08:00
李泽玺 d3a25e44ce Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ae4d2fdaec0d52936a055e3bb17544ba5db2da58':
  climc: make scheduler test project work
 2018-12-12 20:21:15 +08:00
李泽玺 ae4d2fdaec Merge pull request #743 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-climc-schedtest-project to release/2.3.0 
* commit '9a80956ffa9875dc72bf37b0f01e2e2d8b6a36d3':
  climc: make scheduler test project work
 2018-12-12 20:21:15 +08:00
Zexi Li 9a80956ffa climc: make scheduler test project work 2018-12-12 20:19:54 +08:00
李泽玺 acdc6c2d59 Merge pull request #724 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-scheduler-prefer-avoid to release/2.4.0 
* commit '2c5ed4b3607a96109a4e6f288ba1dddfd45b04a8':
  scheduler: make schedtag prefer and avoid strategy work
 2018-12-12 20:07:33 +08:00
Zexi Li 2c5ed4b360 scheduler: make schedtag prefer and avoid strategy work 2018-12-12 19:56:21 +08:00
Qiu Jian 75f04cae51 修正：prepaid recycle host的storage driver设置为Linux 2018-12-12 19:55:35 +08:00
Qiu Jian daa0d7a65d Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-host-undo-recycle-duplicate-external-id 2018-12-12 19:23:38 +08:00
Qiu Jian e0d7cbb431 修正：host-undo-recycle fail 2018-12-12 19:23:03 +08:00
李泽玺 f162ff5844 Merge pull request #741 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-host-sysinfo-nil to release/2.4.0 
* commit 'b64c3b333371987aea51e25d6bc0104194e10ccb':
  region: specs panic when host sysinfo is nil
 2018-12-12 17:48:38 +08:00
Zexi Li b64c3b3333 region: specs panic when host sysinfo is nil 2018-12-12 17:46:56 +08:00
屈轩 7a3ddc7caf 避免同步cache中的安全组 2018-12-12 17:01:14 +08:00
Qiu Jian 09750de934 总是允许使用调度标签，无论公有云还是私有云 2018-12-12 16:51:59 +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