邱剑 ca5571e383 Automatic merge from release/2.3.0 -> release/2.4.0 ...

* commit 'bc66c01ef343b4de09d341079041cd21294f3e38':
  根据腾讯云主机状态判断磁盘是否可以resize

2018-11-12 22:03:46 +08:00

..

appctx

…

appsrv

minor fixes

2018-11-09 12:28:18 +08:00

cloudcommon

Automatic merge from release/2.2.0 -> release/2.3.0

2018-11-12 17:17:24 +08:00

cloudprovider

Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181023-2.3.0

2018-10-23 22:31:47 +08:00

compute

Automatic merge from release/2.3.0 -> release/2.4.0

2018-11-12 22:03:46 +08:00

dns

region-dns: auto k8s config from kube server

2018-11-02 16:25:03 +08:00

httperrors

Merge pull request #252 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/baremetal-control to release/2.3.0

2018-10-24 21:26:30 +08:00

lbagent

lbagent: list with details=true explicitly

2018-11-08 15:37:48 +00:00

mcclient

Automatic merge from release/2.3.0 -> release/2.4.0

2018-11-12 21:16:40 +08:00

proxy

resolve confict

2018-11-09 17:18:17 +08:00

scheduler

Merge branch 'release/2.3.0' into feature/tb-support-aws

2018-11-10 20:03:07 +08:00

util

Automatic merge from release/2.3.0 -> release/2.4.0

2018-11-12 19:46:49 +08:00

webconsole

make webconsole ssl capable

2018-11-03 00:42:33 +08:00

yunionconf

Automatic merge from release/2.2.0 -> release/2.3.0

2018-11-05 16:34:06 +08:00