Qiu Jian 4c6f196ec5 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution ...

Conflicts:
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/policy/defaults.go
	pkg/util/sysutils/sysutils.go

2019-02-15 22:46:01 +08:00

..

appctx

huawei cloud sync

2019-01-01 16:21:37 +08:00

appsrv

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

baremetal

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

cloudcommon

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

cloudir

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

cloudprovider

Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190213

2019-02-13 12:12:19 +08:00

cloutpost

update vendor & make compatible

2018-12-26 23:51:51 +08:00

compute

Automatic merge from release/2.5.0 -> release/2.6.0

2019-02-15 19:58:38 +08:00

dns

huawei cloud sync

2019-01-01 16:21:37 +08:00

hostimage

temp

2019-01-22 16:56:47 +08:00

hostman

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

httperrors

glance重构 update 1

2018-12-26 22:52:13 +08:00

image

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

lbagent

lbagent: fix typo in log

2019-01-15 08:00:44 +00:00

logger

recode huawei client

2019-02-15 02:26:57 +08:00

mcclient

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

proxy

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

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

scheduler

Automatic merge from release/2.5.0 -> release/2.6.0

2019-02-13 15:48:21 +08:00

util

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

webconsole

Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215

2019-02-15 19:47:56 +08:00

yunionconf

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00