TangBin
17ec3fecb0
skus delete query fix
2018-12-14 09:52:22 +08:00
TangBin
cc6d3a5991
delete invalid sku while sync skus
2018-12-13 19:49:30 +08:00
TangBin
34ed406ddd
add clean invalid sku job
2018-12-13 17:44:48 +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
Qiu Jian
46aaba2474
make fmt
2018-12-12 23:24:34 +08: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
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
屈轩
9473893d77
冲突解决
2018-12-12 21:37:03 +08:00
屈轩
6590a00f2a
冲突解决
2018-12-12 21:36:17 +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
邱剑
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
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
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
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
Yousong Zhou
1d013215b3
gofmt
2018-12-12 08:47:04 +00:00
屈轩
aceb20bf79
支持一次性绑定多个安全组
2018-12-12 16:38:18 +08:00
TangBin
779a588bcf
make fmt
2018-12-12 15:43:13 +08:00
TangBin
e00a2005f2
Merge branch 'release/2.4.0' into feature/tb-skus-support-private-cloud
2018-12-12 15:41:59 +08:00
TangBin
cb0823eb70
name bugfix
2018-12-12 15:41:22 +08:00
邱剑
8f2a03e793
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '3608ea66742a0507060768bf7eb4f41d75595a32':
loadbalancerlisteners: 改正rps update
2018-12-12 15:37:13 +08:00
Yousong Zhou
432bab6fa5
loadbalancerlisteners: 改正rps update
2018-12-12 07:35:40 +00:00
邱剑
2f325530ef
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit 'ec71bc2fe99668a49fa2cc1b92413798cf6bec4a':
loadbalancers: 增加rps限速支持
loadbalancers: 清理监听选项名
loadbalancers: 移除Bandwidth字段
2018-12-12 15:32:47 +08: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
邱剑
5943754e7f
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '5e94bdded3422e217d0ac6803ccb26b6794eebf7':
project删除bufix
2018-12-12 15:11:29 +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
邱剑
fad903ce33
Automatic merge from release/2.0.0 -> release/2.1.0
...
* commit '3774ae91700bc04b21440aaf9816d77b1a93e0e5':
project删除bufix
2018-12-12 15:11:28 +08:00
唐斌
fad845cd48
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit 'c37f1621822136e10ba2ada0093758be630736f8':
修复capabilities接口hypervisors为空引发的异常
修复capabilities接口hypervisors为空引发的异常
2018-12-12 15:09:52 +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