屈轩 0770e52eea 解决冲突

2018-11-16 23:08:29 +08:00

..

appctx

…

appsrv

minor fixes

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

cloudcommon

make fmt

2018-11-16 01:43:01 +08:00

cloudprovider

解决冲突

2018-11-16 23:08:29 +08:00

compute

解决冲突

2018-11-16 23:08:29 +08:00

dns

region-dns: use k8s.SKubeClusterManager

2018-11-15 00:41:06 +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

增加user/guest两个权利等级

2018-11-16 01:32:01 +08:00

proxy

resolve confict

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

scheduler

schedule k8s local volume

2018-11-15 11:49:19 +08:00

util

解决冲突

2018-11-16 23:08:29 +08:00

webconsole

Merge pull request #513 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webssh-xterm to release/2.3.0

2018-11-15 20:15:30 +08:00

yunionconf

Automatic merge from release/2.2.0 -> release/2.3.0

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