邱剑 23d883ceae Automatic merge from release/2.5.0 -> release/2.6.0 ...

* commit '274e31d858fb054a0ccda96a65f292df94727740':
  通过provider is_public_cloud区分公有云私有云

2019-02-18 18:29:46 +08:00

..

baremetal

baremetal: task refactor

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

capabilities

…

consts

huawei cloud sync

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

guestdrivers

Merge pull request #1063 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-logger-record-start-time to release/2.6.0

2019-02-18 12:25:16 +08:00

hostdrivers

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

2019-02-16 14:08:56 +08:00

misc

huawei cloud sync

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

models

Automatic merge from release/2.5.0 -> release/2.6.0

2019-02-18 18:29:46 +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

…

tasks

Merge pull request #1063 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-logger-record-start-time to release/2.6.0

2019-02-18 12:25:16 +08:00

usages

merge

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