屈轩 b0bbfb0f1a 解决冲突

2018-12-04 20:27:12 +08:00

..

appctx

add doc.go for each package

2018-08-11 14:41:38 +08:00

appsrv

appsrv: workers: 移除调试用日志

2018-12-03 13:44:46 +00:00

cloudcommon

db_dispatcher: 移除对listFields的调试日志

2018-12-03 13:44:46 +00:00

cloudprovider

解决冲突

2018-12-04 20:27:12 +08:00

compute

解决冲突

2018-12-04 20:27:12 +08:00

dns

region-dns: use k8s.SKubeClusterManager

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

httperrors

httperrors: 修正InternalServerError调用

2018-11-30 03:07:01 +00:00

lbagent

lbagent: list with details=true explicitly

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

mcclient

fix conflict

2018-12-01 16:18:11 +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

解决冲突

2018-12-04 20:27:12 +08:00

webconsole

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

2018-12-03 07:18:27 +08:00

yunionconf

yunionconfig build error fix

2018-12-01 14:52:01 +08:00