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

..

aliyun.go

挂载后端校验

2019-03-04 18:42:14 +08:00

aws.go

挂载后端校验

2019-03-04 18:42:14 +08:00

azure.go

挂载后端校验

2019-03-04 18:42:14 +08:00

baremetal.go

挂载后端校验

2019-03-04 18:42:14 +08:00

base.go

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

doc.go

add doc.go for each package

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

esxi.go

挂载后端校验

2019-03-04 18:42:14 +08:00

huawei.go

挂载后端校验

2019-03-04 18:42:14 +08:00

kvm.go

feature: nic bonding/teaming support on region

2019-03-11 04:45:34 +08:00

managedvirtual.go

Automatic merge from release/2.6.0 -> release/2.7.0

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

openstack.go

挂载后端校验

2019-03-04 18:42:14 +08:00

qcloud.go

挂载后端校验

2019-03-04 18:42:14 +08:00

virtualization.go

esxi support

2018-11-25 08:21:24 +08:00