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

Conflicts:
	pkg/compute/models/secgrouprules.go

2018-11-02 20:42:50 +08:00

..

completed_queue.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

expire_queue.go

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

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

manager.go

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

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

scheduler.go

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

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

task_history.go

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

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

task_queue.go

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

2018-11-02 20:42:50 +08:00