邱剑 05f1a1c5b7 Automatic merge from release/2.5.0 -> release/2.6.0 ...

* commit '383194aa6b10150b916a86480b9b5fdff01fda1b':
  避免同步时出现多个loadbalancer network

2019-01-24 12:19:24 +08:00

..

baremetal

…

capabilities

1.

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

consts

huawei cloud sync

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

guestdrivers

merge release/2.6.0

2019-01-23 11:14:39 +08:00

hostdrivers

merge release/2.6.0

2019-01-23 11:14:39 +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-01-24 12:19:24 +08:00

options

fix merge

2019-01-01 17:07:43 +08:00

service

更新vendor

2019-01-02 17:38:59 +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

fix comment

2019-01-24 11:56:25 +08:00

usages

merge

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