屈轩 c60ca1d6eb resolve conflict

2018-09-15 14:07:45 +08:00

..

baremetal

region: spec handler

2018-09-15 01:49:11 +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

resolve conflict

2018-09-15 14:07:45 +08:00

hostdrivers

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

2018-09-14 14:29:29 +08:00

models

resolve conflict

2018-09-15 14:07:45 +08:00

options

Automatic merge from release/2.1.0 -> release/2.2.0

2018-09-12 20:06:22 +08:00

service

resolve conflict

2018-09-12 15:28:34 +08:00

specs

region: query model by spec keys, filter by zone

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

tasks

resolve conflict

2018-09-15 14:07:45 +08:00

usages

region: cloudregion usage

2018-09-11 18:15:40 +08:00

doc.go

add doc.go for each package

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

handlers.go

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