TangBin 4cb87d487e fix conflict

2018-11-29 21:37:53 +08:00

..

appctx

…

appsrv

Merge pull request #471 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/guest-disks-backup to release/2.4.0

2018-11-26 13:45:08 +08:00

cloudcommon

treewide: 保留httperrors的格式

2018-11-28 07:33:22 +00:00

cloudprovider

fix conflict

2018-11-29 21:37:53 +08:00

compute

fix conflict

2018-11-29 21:37:53 +08:00

dns

region-dns: use k8s.SKubeClusterManager

2018-11-15 00:41:06 +08:00

httperrors

httperrors: 增加NewResourceNotFoundError2(keyword, id)

2018-11-28 07:26:09 +00:00

lbagent

lbagent: list with details=true explicitly

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

mcclient

fix conflict

2018-11-29 21:37:53 +08:00

proxy

treewide: httperrors: 使用http.ResposneWriter时保留msg fmt

2018-11-28 07:39:55 +00:00

scheduler

Automatic merge from release/2.3.0 -> release/2.4.0

2018-11-27 17:34:16 +08:00

util

fix conflict

2018-11-29 21:37:53 +08:00

webconsole

treewide: httperrors: 使用http.ResposneWriter时保留msg fmt

2018-11-28 07:39:55 +00:00

yunionconf

Automatic merge from release/2.2.0 -> release/2.3.0

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