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

Conflicts:
	pkg/compute/tasks/cloud_provider_sync_info_task.go

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

..

provider

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

shell

Automatic merge from release/2.3.0 -> release/2.4.0

2019-01-03 16:23:40 +08:00

disk.go

huawei cloud sync

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

doc.go

huawei cloud sync

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

eip.go

huawei support stage 2

2019-01-19 17:58:00 +08:00

errors.go

huawei cloud sync

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

host.go

优化创建虚机结构

2019-01-24 21:48:13 +08:00

image.go

fixes for qcloud&azure

2019-01-22 22:53:43 +08:00

instance.go

fixes for qcloud&azure

2019-01-22 22:53:43 +08:00

instancenic.go

huawei cloud sync

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

instancetype.go

支持腾讯云资源导入

2018-11-03 17:32:54 +08:00

keypair.go

huawei cloud sync

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

latitud_and_longitude.go

huawei cloud sync

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

localdisk.go

huawei cloud sync

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

localstorage.go

修正：storage增加IsSysDiskStore属性，标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建

2019-01-15 22:42:55 +08:00

network.go

feature:

2019-01-29 23:38:15 +08:00

qcloud.go

huawei cloud sync

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

region.go

Merge pull request #939 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-lb-create to release/2.6.0

2019-01-26 15:57:03 +08:00

securitygroup.go

huawei cloud sync

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

snapshot.go

huawei cloud sync

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

storage.go

修正：storage增加IsSysDiskStore属性，标示是否支持系统盘创建。阿里云cloud存储不支持系统盘创建

2019-01-15 22:42:55 +08:00

storagecache.go

image status 统一

2019-01-25 13:31:42 +08:00

vpc.go

huawei cloud sync

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

wire.go

huawei cloud sync

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

zone.go

Automatic merge from release/2.3.0 -> release/2.4.0

2019-01-03 16:23:40 +08:00