Qiu Jian 72be6d8edd Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-conflict-resolve-20180813 ...

Conflicts:
	pkg/compute/models/disks.go
	pkg/compute/service/service.go

2018-08-13 12:34:48 +08:00

..

cronman

forget to update cronjob lastRun

2018-08-12 09:11:22 +08:00

db

Automatic merge from release/2.0.0 -> release/2.1.0

2018-08-11 22:25:57 +08:00

notifyclient

add doc.go for each package

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

app.go

path move: github.com/yunionio -> yunion.io/x

2018-08-11 14:28:18 +08:00

auth.go

path move: github.com/yunionio -> yunion.io/x

2018-08-11 14:28:18 +08:00

database.go

path move: github.com/yunionio -> yunion.io/x

2018-08-11 14:28:18 +08:00

doc.go

add doc.go for each package

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

options.go

Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0

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