邱剑 c7da5787cf Automatic merge from release/2.5.0 -> release/2.6.0 ...

* commit '6970baa2a08950319069a44d75df4c4272bac775':
  1. network-list add is_private/is_public filter 2. set default image quota to 10

2019-01-30 21:11:11 +08:00

..

models

避免删除非正常状态下image再次恢复时,镜像使用时会出现非预期状态

2019-01-05 18:26:16 +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