Qiu Jian 4e9eab8ee7 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190313-2.7.0 ...

Conflicts:
	pkg/cloudcommon/db/taskman/tasks.go

2019-03-13 16:32:18 +08:00

..

baremetal

baremetal: task refactor

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

capabilities

…

consts

lb: 不记录来自lbagent的GET查询请求

2019-03-12 03:39:20 +00:00

guestdrivers

remove debug logs

2019-03-12 15:11:27 +08:00

hostdrivers

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

2019-03-11 15:03:25 +08:00

misc

fix: Find network by Ip in on-premise networks only

2019-02-19 20:55:07 +08:00

models

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

2019-03-13 16:32:18 +08:00

options

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

2019-03-11 15:03:25 +08:00

regiondrivers

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-04 01:42:39 +08:00

service

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

specs

huawei cloud sync

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

sshkeys

…

storagedrivers

fix: recode host.getWiresOfId

2019-03-11 14:32:36 +08:00

tasks

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

2019-03-13 16:32:18 +08:00

usages

fix: 1. usage hide system servers 2. host undo convert shows wrong

2019-03-12 13:39:22 +08:00