邱剑 476f61f32b Automatic merge from release/2.6.0 -> release/2.7.0 ...

* commit 'e9e2dbaea189e10f44f2b5fd61b11cac09da45f4':
  避免部署主机失败后未设置external_id而删除主机失败
  rebase 2.6.0
  快照磁盘支持区分公有云私有云
  openstack 同步flavor
  openstack创建

2019-02-18 23:02:50 +08:00

..

baremetal

baremetal: task refactor

2019-01-23 21:06:58 +08:00

capabilities

1.

2018-11-30 23:00:11 +08:00

consts

huawei cloud sync

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

guestdrivers

Merge pull request #1024 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-oepnstack-stage2 to release/2.6.0

2019-02-18 23:02:49 +08:00

hostdrivers

openstack 同步flavor

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

misc

huawei cloud sync

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

models

Automatic merge from release/2.6.0 -> release/2.7.0

2019-02-18 23:02:50 +08:00

options

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

2019-02-15 19:47:56 +08:00

regiondrivers

enable batch* interface

2019-01-30 14:27:26 +08:00

service

fix: correct VM expiration date before clean expired prepaid VM

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

skus

huawei cloud sync

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

specs

huawei cloud sync

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

sshkeys

1.

2018-11-30 23:00:11 +08:00

tasks

Merge pull request #1024 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-oepnstack-stage2 to release/2.6.0

2019-02-18 23:02:49 +08:00

usages

merge

2019-01-01 16:34:35 +08:00