Qiu Jian
3356e3b114
调度失败后主机自动允许删除
2018-08-31 22:58:49 +08:00
邱剑
f0069ea96f
Merge pull request #144 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aliyun-apis to release/2.2.0
...
* commit '678a63d0b76729845790ba3ded029a5f29e07eca':
code style fix
bugfix
2018-08-31 22:47:58 +08:00
Yousong Zhou
0094a5cffc
mcclient: options: BaseListOptions: make OrderBy a list option
2018-08-31 11:07:20 +00:00
Yousong Zhou
c559bcd933
resourcebase: updated_at: set list:"user"
2018-08-31 11:07:13 +00:00
Zhang Dongliang
4249e2486a
阿里云服务器同步、全量同步操作日志。
2018-08-31 18:00:07 +08:00
屈轩
3f5b90ca69
resolve conflict
2018-08-31 16:49:21 +08:00
屈轩
1ba5db64cd
添加azure云盘创建代码
2018-08-31 16:29:54 +08:00
TangBin
678a63d0b7
code style fix
2018-08-31 14:22:32 +08:00
Zhang Dongliang
2653a0645a
阿里云解绑
2018-08-31 10:02:56 +08:00
Zhang Dongliang
4e070f5c91
rm log
2018-08-31 09:40:51 +08:00
Zhang Dongliang
adfb5ae364
日志接口重构；阿里云修改密码、变更配置加日志
2018-08-31 09:39:11 +08:00
Zhang Dongliang
c81aafb9bc
阿里云变更配置增加日志
2018-08-31 09:32:46 +08:00
邱剑
4ed958cf84
Automatic merge from release/2.0.0 -> release/2.1.0
...
* commit '2dd13257361edec640f0bdb9d4616a37df7cd211':
cloudcommon: add validator helpers
2018-08-31 01:24:08 +08:00
邱剑
e1d1a86c9e
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '4ed958cf84358b1d6cef59ce42d1ebe90006447a':
cloudcommon: add validator helpers
2018-08-31 01:24:08 +08:00
TangBin
c77a8c6859
bugfix
2018-08-30 20:13:33 +08:00
Yousong Zhou
7ad2624a7c
cloudcommon: add validator helpers
2018-08-30 07:47:08 +00:00
Qiu Jian
a301ee4243
修正：region刚启动未获得token时，验证API请求报500错误
2018-08-30 14:44:16 +08:00
屈轩
2770cc1a42
update
2018-08-30 12:22:50 +08:00
周有松
eb45c18356
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'e9dadfa1b93d63f72f04d329419e9cc6132edf8f':
options: server-reset: pass is_hard only when set
2018-08-30 11:49:39 +08:00
屈轩
9e16988fc9
update
2018-08-30 11:39:55 +08:00
屈轩
5030bd395e
添加创建vpc操作
2018-08-30 11:28:48 +08:00
Yousong Zhou
a1f67a60de
options: server-reset: pass is_hard only when set
2018-08-30 03:22:48 +00:00
周有松
5383982292
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '6c0b16323a8c02056c11746f5e0a9f682b9d2c66':
climc: servers: convert to using mcclient/options
climc: alarmevents: use options for param serialization
climc: use BaseListOptions from mcclient/options
mcclient: options: initial version
dep: -update pkg, structarg, sqlchemy
2018-08-30 11:10:47 +08:00
Yousong Zhou
83e017b9bc
Merge branch 'release/2.0.0' into release/2.1.0
2018-08-30 03:01:08 +00:00
Yousong Zhou
34c2b56ca4
climc: servers: convert to using mcclient/options
2018-08-30 02:48:35 +00:00
Yousong Zhou
f0c706919a
climc: alarmevents: use options for param serialization
2018-08-30 02:48:35 +00:00
Yousong Zhou
5f6fa5be96
mcclient: options: initial version
2018-08-30 02:48:35 +00:00
周有松
cb3c0504d5
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '8b12c71e3aaee4105952d065f53bfa7cc4765b2f':
extend joint filter
2018-08-30 10:24:12 +08:00
周有松
8b12c71e3a
Merge pull request #138 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/extend-joint-filter to release/2.1.0
...
* commit 'e2d405436754ad070ea4112f79abec87420d5d20':
extend joint filter
2018-08-30 10:24:11 +08:00
Qiu Jian
eb9243ab21
temp commit
2018-08-30 02:30:11 +08:00
屈轩
4b53845421
resolve conflict
2018-08-29 21:22:08 +08:00
屈轩
99c2295920
update
2018-08-29 21:15:36 +08:00
屈轩
9af6692003
用户id和subscriptionID放一起
2018-08-29 21:01:34 +08:00
邱剑
cbcc95ee77
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '8ca430b1373d7f91e954e16116c3c712c8910d2e':
补全aliyun driver信息
添加aliyuncli操作
添加GetDetachDiskStatus内容
添加公有云云硬盘同步操作
2018-08-29 18:39:28 +08:00
邱剑
8ca430b137
Merge pull request #132 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/server-disk to release/2.1.0
...
* commit '5ad60302560eb5aeb540c1540902c43769e83dc2':
补全aliyun driver信息
添加aliyuncli操作
添加GetDetachDiskStatus内容
添加公有云云硬盘同步操作
2018-08-29 18:39:27 +08:00
wanyaoqi
e2d4054367
extend joint filter
2018-08-29 17:55:13 +08:00
邱剑
4c24df8d85
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '1a02439127328a272105bfb62c48b4dfa312ba8e':
vendor: add github.com/hako/durafmt
climc: k8s-deployment-create support network
climc: k8s cluster import and addnodes
climc: k8s resource table print
climc: k8s-deployment-create support network
climc: k8s cluster import and addnodes
climc: k8s resource table print
2018-08-29 16:43:49 +08:00
邱剑
1a02439127
Automatic merge from release/2.0.0 -> release/2.1.0
...
* commit '7c19d8e062abb99dd04e260ffc258bea8effd032':
vendor: add github.com/hako/durafmt
climc: k8s-deployment-create support network
climc: k8s cluster import and addnodes
climc: k8s resource table print
climc: k8s-deployment-create support network
climc: k8s cluster import and addnodes
climc: k8s resource table print
2018-08-29 16:43:49 +08:00
Zhang Dongliang
5a1bb8dd97
merge release/2.1.0
2018-08-29 15:52:53 +08:00
Zhang Dongliang
3b8562a22c
更改项目
2018-08-29 15:43:59 +08:00
邱剑
a75e767c16
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'ccaf4f461dada212a6f3246c27dc7e761c685e53':
errors add variable params
错误返回新增data字段
2018-08-29 14:49:42 +08:00
邱剑
ccaf4f461d
Merge pull request #88 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-httperror-add-data-fields to release/2.1.0
...
* commit '57c1766568863a3124032ef79ec7196ccba3c6ab':
errors add variable params
错误返回新增data字段
2018-08-29 14:49:42 +08:00
Zexi Li
a61c37501a
climc: k8s resource table print
2018-08-29 14:43:53 +08:00
屈轩
a75dc1b729
Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure
2018-08-29 10:38:55 +08:00
周有松
c185d5e059
Merge pull request #131 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-related-words to release/2.1.0
...
* commit '1e5a231e0686acf0006ba330bae1bc38da95d3ff':
make dep and fix words releated->related
2018-08-28 22:53:39 +08:00
周有松
a0b2d6c0db
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'c185d5e05900149c2b02d0d6f8631db893697826':
make dep and fix words releated->related
2018-08-28 22:53:39 +08:00
邱剑
02aa82cef4
Merge pull request #130 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-notice-api to release/2.2.0
...
* commit 'a0da87cee59ac767059b47241a3ad131749cab84':
allow return update time
add notice climc command
bugfix
add notice mod
add notice mod
2018-08-28 20:10:23 +08:00
邱剑
f7172df86a
Merge pull request #129 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-op-log to release/2.1.0
...
* commit 'bf7c07174bd0e662002bf43ec3ff7f74a133a9ff':
阿里云机器启动前检查状态
虚机关机启动时携带note信息
2018-08-28 20:09:12 +08:00
屈轩
d52438c1e6
不允许卸载系统盘
2018-08-28 19:58:50 +08:00
TangBin
a0da87cee5
allow return update time
2018-08-28 19:45:33 +08:00
Qiu Jian