邱剑
5ad6d96718
Merge pull request #710 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-cache to release/2.4.0
...
* commit 'c33fb7e283fcde9a17c232110befc9ce1ed877ac':
updates
minor fixes
增加policy缓存，降低日志量和计算量
2018-12-11 11:00:05 +08:00
Qiu Jian
c33fb7e283
updates
2018-12-10 20:05:20 +08:00
屈轩
ff1ffff32a
避免stop失败后未SetStageFailed
2018-12-10 17:09:40 +08:00
Qiu Jian
fc925e38ce
Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-policy-cache
2018-12-10 15:36:18 +08:00
Qiu Jian
da1efdaabf
增加policy缓存，降低日志量和计算量
2018-12-10 15:35:15 +08:00
屈轩
f1a75d4188
冲突解决
2018-12-10 15:04:45 +08:00
屈轩
02a10173a7
添加腾讯云计费信息
2018-12-10 14:58:31 +08:00
邱剑
e6bf848a55
Merge pull request #702 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0
...
* commit 'bb2e1bb55055b6b4336a92790e1d6e25cb6b7bd5':
network name bugfix
cpu&mem list fix
新建失败的主机不能正常删除bugfix
security group name fix
sync security group bugfix
2018-12-10 14:57:59 +08:00
Qiu Jian
cc7da24faa
Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling
2018-12-10 01:08:09 +08:00
邱剑
a04e92f707
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit 'd7597ab58e2bb6013c3ba748dd58abe0d62ec735':
补充eip修改带宽验证代码
2018-12-08 18:38:41 +08:00
屈轩
44196113d7
补充eip修改带宽验证代码
2018-12-08 18:36:14 +08:00
屈轩
43decfbc5f
冲突解决
2018-12-08 18:30:00 +08:00
屈轩
bd297ef3c9
Merge branch 'release/2.4.0' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0
2018-12-08 18:26:46 +08:00
邱剑
2468a39a1b
Automatic merge from release/2.2.0 -> release/2.3.0
...
* commit '6c79c66ef849e90bc8867b990c22938b05b5e6f5':
验证eip更改带宽
2018-12-08 18:25:51 +08:00
屈轩
c7166bb713
验证eip更改带宽
2018-12-08 18:10:07 +08:00
邱剑
721d719c48
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '123fe0cee511887655687d34f1f9d3a044954b7b':
补充eip带宽信息
2018-12-08 18:00:38 +08:00
屈轩
089dd05ba3
Merge branch 'hotfix/qx-validate-eip-change-bandwidth' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0
2018-12-08 17:28:29 +08:00
屈轩
4f5e5bac44
验证eip更改带宽
2018-12-08 17:28:08 +08:00
屈轩
bfb18f766f
补充eip带宽信息
2018-12-08 16:24:46 +08:00
Qiu Jian
b69bc264a2
修正：1. 多余1个磁盘的recycle主机创建失败
2018-12-08 10:29:16 +08:00
Qiu Jian
75701657d0
fix bugs
2018-12-07 21:18:52 +08:00
Qiu Jian
e5f91a0e41
make fmt
2018-12-07 18:02:57 +08:00
邱剑
6d2e3405c6
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '781357045b3e0d1c480e16d32d869132ae2e6f12':
避免因vpc未赋值导致Sort时nil指针访问
2018-12-07 17:53:57 +08:00
屈轩
1902ba24a1
避免因vpc未赋值导致Sort时nil指针访问
2018-12-07 17:35:51 +08:00
TangBin
bb2e1bb550
network name bugfix
2018-12-07 12:25:00 +08:00
Qiu Jian
965e84ea36
update
2018-12-07 02:57:58 +08:00
TangBin
8a2dd8f7f4
新建失败的主机不能正常删除bugfix
2018-12-06 11:01:54 +08:00
TangBin
9164c29b4b
security group name fix
2018-12-06 10:51:20 +08:00
TangBin
097ee0d67d
sync security group bugfix
2018-12-05 20:48:00 +08:00
Qiu Jian
dfb2e0e00c
Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling
2018-12-05 18:09:11 +08:00
Qiu Jian
8ab0275a36
temp commit
2018-12-05 18:06:57 +08:00
唐斌
749c2f1de4
Merge pull request #679 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-skus-sync to release/2.4.0
...
* commit 'ea3df1d1901df9f4869669e894c1894657fb2a33':
make fmt
sync skus bugfix
sku sync add limit & offset
skus sync with account
2018-12-05 17:58:50 +08:00
邱剑
48b3a0062e
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '434c839a49559d7120b64a7593cdf40dd81d7122':
添加腾讯云错误重试代码
2018-12-05 15:36:16 +08:00
邱剑
434c839a49
Merge pull request #677 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qlcoud-error to release/2.3.0
...
* commit '6a7c12b02b2c18bb53fd4b3dc5098b4409ab171e':
添加腾讯云错误重试代码
2018-12-05 15:36:15 +08:00
屈轩
6a7c12b02b
添加腾讯云错误重试代码
2018-12-05 15:33:18 +08:00
TangBin
29c8d86870
skus sync with account
2018-12-05 15:27:38 +08:00
邱剑
54c05397bb
Merge pull request #584 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-secgroups to release/2.4.0
...
* commit 'e34e45d00849a2ba9e05f00687c24b5841077e79':
限制虚机绑定安全组数量
初始化model
2018-12-05 14:26:52 +08:00
屈轩
e34e45d008
限制虚机绑定安全组数量
2018-12-05 12:40:47 +08:00
邱剑
ef5fe200cd
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit 'e11aa75a45e2ccb1ef8299db5de7c15337ca9654':
normalize镜像版本
2018-12-05 12:24:54 +08:00
屈轩
653ab7b414
normalize镜像版本
2018-12-05 12:06:49 +08:00
Qiu Jian
669081f7f3
Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling
2018-12-05 01:14:45 +08:00
Qiu Jian
3e87c17e72
support prepaid server create and renew
2018-12-05 00:40:15 +08:00
邱剑
e9fd892b05
Automatic merge from release/2.3.0 -> release/2.4.0
...
* commit '1f4c7d1f35b005fe7319357bfca083eefdc9df2a':
id为空统一处理
2018-12-04 21:33:13 +08:00
屈轩
4cce589b35
id为空统一处理
2018-12-04 21:16:52 +08:00
邱剑
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
屈轩
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
屈轩
3fa55efe42
腾讯云导入镜像适配
2018-12-04 18:50:58 +08:00
邱剑