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
2019-02-20 16:18:13 +08:00
2019-03-06 00:12:01 +08:00
2019-03-07 21:35:17 +08:00
2018-07-27 15:59:17 +08:00
2019-01-14 15:57:52 +08:00
2019-03-06 00:12:01 +08:00
2019-03-04 18:41:46 +08:00
2018-07-27 15:59:17 +08:00
2018-12-13 10:31:48 +08:00
2018-07-27 15:59:17 +08:00
Description
A cloud-native open-source unified multi-cloud and hybrid-cloud platform. 开源、云原生的多云管理及混合云融合平台
Readme Apache-2.0 272 MiB
Languages
Go 99.5%
Shell 0.4%