Zexi Li 88fdb47fb6 resolve confict

2018-11-09 17:18:17 +08:00

..

appctx

add doc.go for each package

2018-08-11 14:41:38 +08:00

appsrv

Automatic merge from release/2.2.0 -> release/2.3.0

2018-10-27 11:22:14 +08:00

cloudcommon

Merge pull request #446 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181109-2.3.0 to release/2.3.0

2018-11-09 15:39:50 +08:00

cloudprovider

Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181023-2.3.0

2018-10-23 22:31:47 +08:00

compute

Merge pull request #446 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181109-2.3.0 to release/2.3.0

2018-11-09 15:39:50 +08:00

dns

region-dns: auto k8s config from kube server

2018-11-02 16:25:03 +08:00

httperrors

Merge pull request #252 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/baremetal-control to release/2.3.0

2018-10-24 21:26:30 +08:00

lbagent

lbagent: list with details=true explicitly

2018-11-08 15:37:48 +00:00

mcclient

Merge pull request #441 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0

2018-11-09 14:11:24 +08:00

proxy

resolve confict

2018-11-09 17:18:17 +08:00

scheduler

Merge pull request #438 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-tenant to release/2.3.0

2018-11-08 20:04:07 +08:00

util

pkg: httputils: ParseJSONResponse(): rewrite for clearness

2018-11-08 15:36:24 +00:00

webconsole

make webconsole ssl capable

2018-11-03 00:42:33 +08:00

yunionconf

Automatic merge from release/2.2.0 -> release/2.3.0

2018-11-05 16:34:06 +08:00