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

..

baremetal

baremetal: task refactor

2019-01-23 21:06:58 +08:00

capabilities

1.

2018-11-30 23:00:11 +08:00

consts

fix: break dependencies of climc/mcclient on compute/models

2019-02-27 16:40:13 +08:00

guestdrivers

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

hostdrivers

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

misc

fix: Find network by Ip in on-premise networks only

2019-02-19 20:55:07 +08:00

models

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

options

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

regiondrivers

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

service

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

2019-03-06 00:11:44 +08:00

specs

huawei cloud sync

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

sshkeys

1.

2018-11-30 23:00:11 +08:00

storagedrivers

fix: recode host.getWiresOfId

2019-03-11 14:32:36 +08:00

tasks

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

usages

merge

2019-01-01 16:34:35 +08:00