Qiu Jian 8815193f33 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311 ...

Conflicts:
	pkg/compute/guestdrivers/aws.go
	pkg/compute/guestdrivers/huawei.go
	pkg/compute/guestdrivers/openstack.go
	pkg/compute/models/guests.go
	pkg/compute/models/hosts.go

2019-03-11 15:03:25 +08:00

..

appctx

make fmt

2019-02-16 15:17:31 +08:00

appsrv

fix metadata port, appsrv add check quitHandlerRegisted

2019-02-28 21:15:45 +08:00

baremetal

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-10 13:52:16 +08:00

cloudcommon

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

2019-03-11 15:03:25 +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.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-07 15:22:58 +08:00

cloutpost

…

compute

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

2019-03-11 15:03:25 +08:00

dns

fix: build broken for changing GetNetworkOfIP to GetOnPremiseNetworkOfIP

2019-02-21 11:02:37 +08:00

hostimage

…

hostman

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

2019-03-11 15:03:25 +08:00

httperrors

修正一些错误信息描述

2019-03-07 16:48:15 +08:00

image

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

lbagent

…

logger

fix: action log always success

2019-02-23 21:00:40 +08:00

mcclient

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

2019-03-11 15:03:25 +08:00

proxy

…

scheduler

scheduler: add scheduler forecast api

2019-03-04 14:06:01 +08:00

util

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

2019-03-11 15:03:25 +08:00

webconsole

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~tangbin/onecloud into release/2.7.0

2019-03-07 11:08:37 +08:00

yunionconf

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-04 01:42:39 +08:00