Qiu Jian 52ab56fa3f Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock ...

Conflicts:
	pkg/compute/guestdrivers/aws.go

2019-03-07 15:22:58 +08:00

..

provider

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

shell

同步openstack项目

2019-03-04 18:29:06 +08:00

disk.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-06 23:47:30 +08:00

doc.go

补充openstack v3认证信息

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

flavor.go

修复套餐系统盘盘大小异常问题

2019-03-05 14:10:02 +08:00

host.go

修复套餐系统盘盘大小异常问题

2019-03-05 14:10:02 +08:00

image.go

create instance tips fix && min_ram fix

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

instance.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 14:47:14 +08:00

instancenic.go

修复opentack同步的问题

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

keypaire.go

rebase 2.6.0

2019-02-16 17:44:40 +08:00

network.go

同步openstack项目

2019-03-04 18:29:06 +08:00

openstack.go

同步openstack项目

2019-03-04 18:29:06 +08:00

port.go

openstack创建

2019-02-16 17:37:33 +08:00

project.go

同步openstack项目

2019-03-04 18:29:06 +08:00

quota.go

rebase 2.6.0

2019-02-16 17:44:40 +08:00

region.go

避免创建vpc后wire同步异常

2019-03-05 16:34:44 +08:00

securitygroup.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-05 23:14:45 +08:00

snapshot.go

同步openstack项目

2019-03-04 18:29:06 +08:00

storage.go

创建openstack磁盘使用默认的zone

2019-03-06 21:16:26 +08:00

storagecache.go

openstack 同步flavor

2019-02-16 17:38:30 +08:00

vpc.go

虚拟zone

2019-03-01 16:41:11 +08:00

wire.go

虚拟zone

2019-03-01 16:41:11 +08:00

zone.go

解决冲突

2019-03-03 14:54:48 +08:00