屈轩 bf06bcdc8a 解决冲突

2018-11-26 16:52:02 +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

解决冲突

2018-11-26 16:52:02 +08:00

hostdrivers

fix confilct

2018-11-19 15:08:04 +08:00

models

解决冲突

2018-11-26 16:52:02 +08:00

options

support nfs storage

2018-11-26 13:49:32 +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

解决冲突

2018-11-26 16:52:02 +08:00

usages

增加user/guest两个权利等级

2018-11-16 01:32:01 +08:00

doc.go

add doc.go for each package

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

handlers.go

解决冲突

2018-11-26 16:52:02 +08:00