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

Conflicts:
	Gopkg.lock

2019-02-13 21:49:51 +08:00

..

models

fix image misc bugs

2019-02-13 00:10:03 +08:00

options

1. network-list add is_private/is_public filter

2019-01-30 20:50:22 +08:00

service

snapshot recycle, disk recycle, dhcp relay use raw socket

2019-01-25 20:32:44 +08:00

tasks

minor fixes

2019-01-05 19:37:00 +08:00

torrent

1. 增加EnableTorrentService选项 2. 增加PerformMarkPublicProtected接口

2018-12-27 18:24:04 +08:00

usages

recode quota and usage for image service

2018-12-27 23:59:31 +08:00