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

Conflicts:
	pkg/compute/hostdrivers/base.go

2018-11-15 11:12:07 +08:00

..

baremetal

baremetal ops

2018-10-23 21:01:00 +08:00

capabilities

Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure

2018-09-15 14:02:21 +08:00

guestdrivers

Merge pull request #503 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-templateid-sync to release/2.3.0

2018-11-15 11:08:03 +08:00

hostdrivers

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

2018-11-15 11:12:07 +08:00

models

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

2018-11-15 11:12:07 +08:00

options

update vendor and fix conficlt

2018-11-07 17:47:00 +08:00

service

update vendor

2018-11-10 20:00:36 +08:00

specs

region: query model by spec keys, filter by zone

2018-09-15 05:27:29 +08:00

sshkeys

修正：1. 阿里云自动设置Import/Export image ram授权，不再需要手动授权 2.

2018-10-13 20:36:15 +08:00

tasks

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

2018-11-13 19:10:40 +08:00

usages

修正：普通用户无法访问admin权限的资源

2018-11-14 22:30:17 +08:00

doc.go

add doc.go for each package

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

handlers.go

baremetal ops

2018-10-23 21:01:00 +08:00