Qiu Jian cce3d04fc1 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190305 ...

Conflicts:
	pkg/util/qemuimg/qemuimg.go

2019-03-05 12:28:06 +08:00

..

doc.go

add doc.go && make ParseOptions changes

2018-12-26 22:59:08 +08:00

image_check_task.go

minor fixes

2018-12-29 13:43:49 +08:00

image_convert_task.go

fix: not set converting status

2019-03-05 09:48:36 +08:00

image_copy_from_url_task.go

fix: build error because of notify and actionlog interface change

2019-02-18 15:25:53 +08:00

image_delete_task.go

伪删除镜像的清理需要增加override-pending-delete的参数

2019-01-03 20:10:49 +08:00