屈轩 115b3370e4 解决冲突

2018-08-08 22:05:11 +08:00

..

appctx

- mv mcclient to pkg/mcclient

2018-08-01 14:13:23 +08:00

appsrv

- mv mcclient to pkg/mcclient

2018-08-01 14:13:23 +08:00

cloudcommon

add region in server details

2018-08-06 19:35:13 +08:00

cloudprovider

解决合并冲突

2018-08-03 16:03:49 +08:00

compute

解决冲突

2018-08-08 22:05:11 +08:00

dns

dns: 支持 SRV

2018-08-06 17:13:07 +08:00

httperrors

add disk-op code

2018-08-02 14:52:24 +08:00

mcclient

- mv mcclient to pkg/mcclient

2018-08-01 14:13:23 +08:00

proxy

- mv mcclient to pkg/mcclient

2018-08-01 14:13:23 +08:00

scheduler

scheduler: allow run container in kubelet host

2018-08-07 12:09:20 +08:00

util

Merge branch 'release/2.0.0' of ssh://git.yunion.io/yunionio/onecloud into hotfix/lzx-dns-auto-merge-210

2018-08-07 21:00:51 +08:00