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

更新vendor

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

disk.go

更新vendor

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

doc.go

补充openstack v3认证信息

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

host.go

解决冲突

2019-01-26 18:47:47 +08:00

instance.go

修复opentack同步的问题

2019-01-26 16:45:37 +08:00

instancenic.go

修复opentack同步的问题

2019-01-26 16:45:37 +08:00

network.go

feature:

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

openstack.go

system service

2019-01-22 16:56:48 +08:00

port.go

优先使用hypervisor接口

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

region.go

统一LoadBalancer函数大小写问题

2019-01-25 14:57:57 +08:00

securitygroup.go

优先使用hypervisor接口

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

snapshot.go

更新vendor

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

storage.go

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

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

storagecache.go

更新vendor

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

vpc.go

修复opentack同步的问题

2019-01-26 16:45:37 +08:00

wire.go

优先使用hypervisor接口

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

zone.go

Merge pull request #984 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/host-baremetal-v2 to release/2.6.0

2019-01-28 20:04:24 +08:00