邱剑 268866f8a2 Automatic merge from release/2.4.0 -> release/2.5.0 ...

* commit 'ffb25c7121c513a7e610433dd90a4345998609a1':
  腾讯云续费实例没有ClientToken参数

2019-03-14 18:28:41 +08:00

..

appctx

huawei cloud sync

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

appsrv

huawei cloud sync

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

cloudcommon

修复: joint 的对象创建时没有检验是否存在，会被重复添加

2019-03-08 19:08:35 +08:00

cloudir

update vendor & make compatible

2018-12-26 23:51:51 +08:00

cloudprovider

通过provider is_public_cloud区分公有云私有云

2019-02-18 17:43:31 +08:00

cloutpost

update vendor & make compatible

2018-12-26 23:51:51 +08:00

compute

fix conflicts

2019-03-14 10:53:52 +08:00

dns

huawei cloud sync

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

hostimage

huawei cloud sync

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

httperrors

glance重构 update 1

2018-12-26 22:52:13 +08:00

image

fix: isActive error message include filename

2019-03-05 10:20:23 +08:00

lbagent

lbagent: fix typo in log

2019-01-15 08:00:44 +00:00

mcclient

fix conflicts

2019-03-14 10:53:52 +08:00

proxy

treewide: httperrors: 使用http.ResposneWriter时保留msg fmt

2018-11-28 07:39:55 +00:00

scheduler

baremetal: host convert failed

2019-02-13 15:10:10 +08:00

util

Automatic merge from release/2.4.0 -> release/2.5.0

2019-03-14 18:28:41 +08:00

webconsole

冲突解决

2019-03-04 21:21:14 +08:00

yunionconf

parameter create fix

2019-02-26 18:29:32 +08:00