邱剑 205b06605a Automatic merge from release/2.4.0 -> release/2.5.0 ...

* commit '356fe05d6ee75f7c52f5fdf55f0317829b1475de':
  冲突解决
  阿里云错误重试

2018-12-21 15:27:28 +08:00

..

appctx

recode, add subaccountproject

2018-12-08 14:37:57 +08:00

appsrv

appsrv: remove debug code

2018-12-19 13:15:59 +00:00

cloudcommon

Automatic merge from release/2.4.0 -> release/2.5.0

2018-12-20 10:28:30 +08:00

cloudprovider

Automatic merge from release/2.4.0 -> release/2.5.0

2018-12-21 11:08:18 +08:00

compute

Automatic merge from release/2.4.0 -> release/2.5.0

2018-12-21 11:08:26 +08:00

dns

fix: region-dns compile failed

2018-12-19 16:41:56 +08:00

hostimage

make fmt

2018-12-19 01:02:23 +08:00

httperrors

httperrors: 修正InternalServerError调用

2018-11-30 03:07:01 +00:00

lbagent

Automatic merge from release/2.3.0 -> release/2.4.0

2018-12-12 21:14:07 +08:00

mcclient

Automatic merge from release/2.4.0 -> release/2.5.0

2018-12-21 10:11:00 +08:00

proxy

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

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

scheduler

make fmt

2018-12-19 01:02:23 +08:00

util

Automatic merge from release/2.4.0 -> release/2.5.0

2018-12-21 15:27:28 +08:00

webconsole

update

2018-12-07 02:57:58 +08:00

yunionconf

update

2018-12-07 02:57:58 +08:00