Qiu Jian 6fccbfcd6e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190213 ...

Conflicts:
	pkg/compute/models/guests.go
	pkg/compute/service/service.go
	pkg/compute/tasks/cloud_provider_sync_info_task.go

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

..

doc.go

补充openstack v3认证信息

2019-01-02 17:32:38 +08:00

provider.go

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

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