邱剑
fa5290f4e4
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '5ddb796c9d51eb3dde002f808010e3f48703f2b7':
不序列化export_file和export_texts
修正：qutoa的images使用量不准确
支持将list的结果导出为excel文件
2018-09-18 10:26:15 +08:00
邱剑
5ddb796c9d
Merge pull request #227 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-support-excel-export to release/2.1.0
...
* commit 'ad83b42b1a32cdfaf6aec33a783c9c142d13610c':
不序列化export_file和export_texts
修正：qutoa的images使用量不准确
支持将list的结果导出为excel文件
2018-09-18 10:26:15 +08:00
邱剑
ab18249465
Merge pull request #177 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-paramter-climc to release/2.2.0
...
* commit '96713696b82ebe866f7d91c867d051325d04deea':
add auth complete callback
bugfix import path error
add yunionconf service
fix help desc string
bugfix
add parameter climc
delete&update parameter in context
temp!!withbugs
add climc
2018-09-18 10:03:37 +08:00
Qiu Jian
ad83b42b1a
不序列化export_file和export_texts
2018-09-18 09:46:59 +08:00
Qiu Jian
70be87bbe5
修正：qutoa的images使用量不准确
2018-09-17 22:36:50 +08:00
Qiu Jian
03af1fc8a2
支持将list的结果导出为excel文件
2018-09-17 22:36:08 +08:00
邱剑
02ae6aacb3
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '6061860fed82f4a62d5e19ab895ff20e4f77085f':
region: add network port usage
2018-09-17 12:31:26 +08:00
邱剑
6061860fed
Merge pull request #224 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-usage-port to release/2.1.0
...
* commit '047217a52d80963842e3729ec6bc5cf1e33715ef':
region: add network port usage
2018-09-17 12:31:25 +08:00
Zexi Li
047217a52d
region: add network port usage
2018-09-17 12:19:22 +08:00
邱剑
34420c83ab
Merge pull request #197 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0
...
* commit 'c02425506d02960a60d849be53d9904b4062d20b':
fix convert
if disk resized, update disk size to snapshot size did not auto snapshot when guest not in status ready or running add snapshot-show
disk reset minor fixs
fix code
2018-09-17 12:16:15 +08:00
邱剑
69f9492e2d
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '1a733935b2a43641cb501d4f64a40c54c9fc32d1':
修正：eip操作失败后没有正确恢复状态
2018-09-17 11:43:58 +08:00
邱剑
1a733935b2
Merge pull request #223 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-eip-bugfix-20180915 to release/2.1.0
...
* commit 'c2111bcc6e3cd72dc69ce5816e71ee6f86954071':
修正：eip操作失败后没有正确恢复状态
2018-09-17 11:43:57 +08:00
邱剑
d2a305f836
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '183e1ec0abcaef9eb7dd3ad8e4c753ea8f62a784':
cloudcommon: resourcebase: add UpdateVersion to list columns
cloudcommon: statusstandalone: allow specifying status on creation
2018-09-17 10:51:42 +08:00
邱剑
183e1ec0ab
Merge pull request #222 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0
...
* commit '9943fe6491a1c87569d9bb0804cd5b6cc0478737':
cloudcommon: resourcebase: add UpdateVersion to list columns
cloudcommon: statusstandalone: allow specifying status on creation
2018-09-17 10:51:42 +08:00
Qiu Jian
c2111bcc6e
修正：eip操作失败后没有正确恢复状态
2018-09-17 09:16:49 +08:00
Yousong Zhou
9943fe6491
cloudcommon: resourcebase: add UpdateVersion to list columns
2018-09-15 13:59:39 +00:00
Yousong Zhou
63cd662762
cloudcommon: statusstandalone: allow specifying status on creation
2018-09-15 13:59:36 +00:00
邱剑
18068b0c1e
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '1bb838607b441c9e4f14240bcc13c0007cbd2d41':
minor fixes
minior fixes
guestdisk support index filter
修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
2018-09-15 21:30:39 +08:00
邱剑
1bb838607b
Merge pull request #220 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180915 to release/2.1.0
...
* commit 'e460919cbe404a9cda851eabadb96cc8575fa524':
minor fixes
minior fixes
guestdisk support index filter
修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
2018-09-15 21:30:38 +08:00
Qiu Jian
e460919cbe
minor fixes
2018-09-15 19:44:48 +08:00
Qiu Jian
fc5b3e68db
minior fixes
2018-09-15 18:12:20 +08:00
Qiu Jian
f43c278d90
guestdisk support index filter
2018-09-15 18:04:08 +08:00
邱剑
4101fa1bc0
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '3ff6b1d37cf91b19ea85e95371b38a584a7676b8':
region: user usage
2018-09-15 18:03:07 +08:00
邱剑
3ff6b1d37c
Merge pull request #219 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-user-usage to release/2.1.0
...
* commit '1c01d7b45f28698e78d47d2433edcde6c794d65f':
region: user usage
2018-09-15 18:03:07 +08:00
Zexi Li
1c01d7b45f
region: user usage
2018-09-15 17:50:59 +08:00
李泽玺
2c7a97b2d4
Merge pull request #218 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/meter-resource-query-export to release/2.2.0
...
* commit 'bff2fd4649fccb5778d63fa2ab7d2254e60e3c36':
zhengjiajie modify code style
zhengjiajie modify column items
2018-09-15 17:28:01 +08:00
zhengjiajie
bff2fd4649
zhengjiajie modify code style
2018-09-15 17:24:59 +08:00
Qiu Jian
c624d4ec6c
修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root
...
no-account-init无效 3. 其他问题...
2018-09-15 17:05:17 +08:00
zhengjiajie
b09e6da1fc
zhengjiajie modify column items
2018-09-15 15:56:15 +08:00
邱剑
86eca9166f
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '7199e848d46f7509d5b10eac00d1623ad073e9e7':
adjust import order
fix typos
增加eip操作的状态变化
network/wire/vpc增加zone/region信息
修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
2018-09-15 12:53:10 +08:00
邱剑
ba5c6ad824
Automatic merge from release/2.2.0 -> master
...
* commit '86eca9166f40b8653bc28fdae865585727c56062':
adjust import order
fix typos
增加eip操作的状态变化
network/wire/vpc增加zone/region信息
修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
2018-09-15 12:53:10 +08:00
邱剑
7199e848d4
Merge pull request #215 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180914 to release/2.1.0
...
* commit 'd9e401249e5ccd4108e011a47e6145d7ee8e7002':
adjust import order
fix typos
增加eip操作的状态变化
network/wire/vpc增加zone/region信息
修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
2018-09-15 12:53:09 +08:00
Qiu Jian
d9e401249e
adjust import order
2018-09-15 12:40:32 +08:00
Qiu Jian
588829bcb0
fix typos
2018-09-15 12:32:42 +08:00
Qiu Jian
ee8e8bc2b5
增加eip操作的状态变化
2018-09-15 12:31:27 +08:00
Qiu Jian
876fadd6a8
network/wire/vpc增加zone/region信息
2018-09-15 10:48:28 +08:00
邱剑
38febe3769
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'e46e08fa176e26efb3e3028a67e1f2966fef410e':
修正: zone-capability spec 信息不生效
2018-09-15 10:41:32 +08:00
邱剑
162a5eea08
Automatic merge from release/2.2.0 -> master
...
* commit '38febe37696f556f3f749b5a96074e4d78e14edb':
修正: zone-capability spec 信息不生效
2018-09-15 10:41:32 +08:00
邱剑
e46e08fa17
Merge pull request #217 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-zone-capability-spec to release/2.1.0
...
* commit 'b7c8d1619fd91eefd78ed4cf98d9ee20b2c35346':
修正: zone-capability spec 信息不生效
2018-09-15 10:41:31 +08:00
Zexi Li
b7c8d1619f
修正: zone-capability spec 信息不生效
2018-09-15 10:39:56 +08:00
李泽玺
981b543e87
Automatic merge from release/2.2.0 -> master
...
* commit '33a98593cb61f837277331bcb73652f332543235':
region: capabilities add specs
region: query model by spec keys, filter by zone
region: spec handler
2018-09-15 10:16:31 +08:00
李泽玺
33a98593cb
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '91ca98de309e2aeb2eb5af0f7c4cde213585c721':
region: capabilities add specs
region: query model by spec keys, filter by zone
region: spec handler
2018-09-15 10:16:30 +08:00
李泽玺
91ca98de30
Merge pull request #216 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-spec to release/2.1.0
...
* commit '27f7e0d55f3104f0e9bab68fa77b254b45c6e3c2':
region: capabilities add specs
region: query model by spec keys, filter by zone
region: spec handler
2018-09-15 10:16:30 +08:00
Zexi Li
27f7e0d55f
region: capabilities add specs
2018-09-15 10:15:02 +08:00
Zexi Li
2d1484f71e
region: query model by spec keys, filter by zone
2018-09-15 05:27:29 +08:00
Zexi Li
2ea45a7120
region: spec handler
2018-09-15 01:49:11 +08:00
Qiu Jian
8c2250517f
修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3.
...
billing_type字段为空导致创建主机失败问题
2018-09-15 00:31:58 +08:00
wanyaoqi
c02425506d
fix convert
2018-09-14 22:06:29 +08:00
邱剑
4fe7669a2b
Automatic merge from release/2.2.0 -> master
...
* commit '9e58b400d62459400d5b120b5ece083f30e5af4f':
default unuse cached token
add change flavor fail status
2018-09-14 20:23:05 +08:00
邱剑
9e58b400d6
Merge pull request #214 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.2.0-20180914-20 to release/2.2.0
...
* commit 'aad6aada760e3db7f5cdb23bfaa3bc4a9fcbe009':
default unuse cached token
add change flavor fail status
2018-09-14 20:23:05 +08:00
邱剑