屈轩
c09a63442f
Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure
2018-09-15 14:02:21 +08:00
屈轩
3c5671d188
Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure
2018-09-14 14:29:29 +08:00
邱剑
784dc871e4
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'f331e3917d7eef2efac7ac1f6df3edd7dafffa26':
region: network list by cloudregion
2018-09-14 13:45:35 +08:00
邱剑
f331e3917d
Merge pull request #208 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-network-list-by-region to release/2.1.0
...
* commit 'eb77372794804d7f500c188b28ba24ecda6542b3':
region: network list by cloudregion
2018-09-14 13:45:35 +08:00
邱剑
398f21aec4
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '398d51b44818ee04aee493fdc9ab3360f2202bce':
climc: add name filter to k8s list resource
climc: k8s-deployment-create support labels
2018-09-14 13:45:15 +08:00
邱剑
398d51b448
Merge pull request #204 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-deployment-label to release/2.1.0
...
* commit 'a70fee75301c9c71cc4aed7db1faa3e42f9cf183':
climc: add name filter to k8s list resource
climc: k8s-deployment-create support labels
2018-09-14 13:45:15 +08:00
Zexi Li
eb77372794
region: network list by cloudregion
2018-09-14 13:26:43 +08:00
Zexi Li
a70fee7530
climc: add name filter to k8s list resource
2018-09-14 13:17:48 +08:00
Qiu Jian
9af8de9bf8
minior fixes
2018-09-14 11:57:17 +08:00
Qiu Jian
2ece630d4a
Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.2.0-20180914
...
Conflicts:
pkg/compute/guestdrivers/aliyun.go
2018-09-14 11:26:23 +08:00
Qiu Jian
1c427f3c1b
修正rebuildroot后API获取的磁盘列表不完整的问题
2018-09-14 11:18:20 +08:00
Zexi Li
3f8604e549
climc: k8s-deployment-create support labels
2018-09-14 11:01:55 +08:00
Qiu Jian
76231936a9
Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-bugfix-misc-20180913
2018-09-14 01:47:12 +08:00
Qiu Jian
447b0b4a1c
undo changes to virtualjointbase.go
2018-09-14 01:42:59 +08:00
Qiu Jian
f7769ef1e3
修正：1. 阿里云rebuild root重构 2. 其他一些fix
2018-09-14 01:15:41 +08:00
李泽玺
f922bc1b0d
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '5b74e3c8e60956682d043f833994dd4d2c9a5c43':
climc: k8s options, code refactor
2018-09-13 18:24:58 +08:00
李泽玺
5b74e3c8e6
Merge pull request #202 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-climc-k8s.v3 to release/2.1.0
...
* commit 'f1fec1b49e2d57456f14a0f7f6db4ceec037a4e2':
climc: k8s options, code refactor
2018-09-13 18:24:57 +08:00
屈轩
37e4b5d1af
resolve conflict
2018-09-13 18:01:43 +08:00
屈轩
9835e63e75
resolve conflict
2018-09-13 16:27:06 +08:00
屈轩
730d83b733
resolve conflict
2018-09-13 16:25:56 +08:00
屈轩
ac979bc8c1
Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure
2018-09-13 16:22:53 +08:00
Zexi Li
f1fec1b49e
climc: k8s options, code refactor
2018-09-13 15:04:39 +08:00
邱剑
520baa80f1
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'e5c7ad38d422b2babdeb78bf57b659f53ebb865e':
logserver obj-name 默认值
logserver objid 默认值
2018-09-13 12:16:48 +08:00
邱剑
e5c7ad38d4
Merge pull request #198 in YUNIONIO/onecloud from hotfix/rex-20180912-logclient-objid to release/2.1.0
...
* commit '8e2d077f2aa9edd6a4ed45da1c664aef2826388c':
logserver obj-name 默认值
logserver objid 默认值
2018-09-13 12:16:48 +08:00
邱剑
8cc801394b
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '28a662ecc82c7c27517338ddbb51cbfdbcd8da47':
修正：zones/<zone_id>/capabilities => zones/<zone_id>/capability
2018-09-13 12:16:31 +08:00
Qiu Jian
013262e25f
修正：zones/<zone_id>/capabilities => zones/<zone_id>/capability
2018-09-13 12:10:29 +08:00
周有松
019784716e
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'f603867960fab8c2aa57a0b7f5eea8aaf12c67c9':
validators: add Optional() to IValidator for use in ValidateUpdateData()
mcclient: options: set details=true when --pending-delete-all is specified
cloudcommon: virtualresource: show pending_deleted field when queried
cloudcommon: virtualresource: optimize list with --field specified
2018-09-13 11:59:58 +08:00
Yousong Zhou
dd38b2b53d
validators: add Optional() to IValidator for use in ValidateUpdateData()
2018-09-13 02:06:41 +00:00
Yousong Zhou
51307dedc5
mcclient: options: set details=true when --pending-delete-all is specified
...
This is required to get values of pending_deleted field
2018-09-13 02:06:41 +00:00
Yousong Zhou
c66e264aff
cloudcommon: virtualresource: show pending_deleted field when queried
2018-09-13 02:06:41 +00:00
Yousong Zhou
2ff04e3d97
cloudcommon: virtualresource: optimize list with --field specified
...
No functional change
2018-09-13 02:06:12 +00:00
Zhang Dongliang
8e2d077f2a
logserver obj-name 默认值
2018-09-13 06:11:46 +08:00
Zhang Dongliang
a4db1e57c3
logserver objid 默认值
2018-09-12 21:51:09 +08:00
邱剑
7c3dd189ba
Automatic merge from release/2.0.0 -> release/2.1.0
...
* commit '7863b7c0850a1a5d3fd206df87c62ddc8b995bde':
rbd类型disk需要path路径
2018-09-12 20:23:28 +08:00
邱剑
8893f3a615
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '7c3dd189ba31928e3cfbd4242baab562690d6442':
rbd类型disk需要path路径
2018-09-12 20:23:28 +08:00
邱剑
7863b7c085
Merge pull request #195 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk to release/2.0.0
...
* commit '2bd249be264fd828b09924ffd630c6717edb9ffa':
rbd类型disk需要path路径
2018-09-12 20:23:27 +08:00
邱剑
329cf9aa5a
Merge pull request #196 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-misc-20180912 to release/2.1.0
...
* commit '860f6b8c0248f9d3951ae6538ae29d1bf81432a4':
修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
2018-09-12 20:06:22 +08:00
邱剑
24751ec50a
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '329cf9aa5afa944ddacdebee004bafd3e4cdb610':
修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
2018-09-12 20:06:22 +08:00
邱剑
883f321db7
Merge pull request #194 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storage-choise to release/2.0.0
...
* commit 'f3b4b4d3146c9ac5b12bad89eb3d48842984aab0':
避免只使用第一个storage
2018-09-12 19:29:08 +08:00
邱剑
48dd7ffe37
Automatic merge from release/2.0.0 -> release/2.1.0
...
* commit '883f321db71934a59d6b789d3febf7d8f5579def':
避免只使用第一个storage
2018-09-12 19:29:08 +08:00
邱剑
03d7534c42
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '48dd7ffe3728516823a2de4afa93965678b5577b':
避免只使用第一个storage
2018-09-12 19:29:08 +08:00
Qiu Jian
860f6b8c02
修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
2018-09-12 18:22:50 +08:00
屈轩
2bd249be26
rbd类型disk需要path路径
2018-09-12 17:08:25 +08:00
屈轩
f3b4b4d314
避免只使用第一个storage
2018-09-12 16:12:47 +08:00
邱剑
09747bcd53
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'f15f944e04d7212d6723e0f03a26285dcc2dd313':
避免storagecachedimage数据库操作时panic
2018-09-12 15:34:32 +08:00
邱剑
f15f944e04
Merge pull request #193 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storage-cached-image to release/2.1.0
...
* commit '063a7c1b00c691ff25223ff1d2f3755a4ae9ae5a':
避免storagecachedimage数据库操作时panic
2018-09-12 15:34:32 +08:00
屈轩
063a7c1b00
避免storagecachedimage数据库操作时panic
2018-09-12 15:30:35 +08:00
屈轩
20381d0775
resolve conflict
2018-09-12 15:28:34 +08:00
邱剑
ff12a413f0
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'e8cf494496812371b4d326866d400878eb45fb84':
避免append同一个network
2018-09-12 15:21:45 +08:00
邱剑
e8cf494496
Automatic merge from release/2.0.0 -> release/2.1.0
...
* commit '5087a48e8e3720f8666972f55946c81c277db2aa':
避免append同一个network
2018-09-12 15:21:45 +08:00
屈轩