周有松 a97e2faea8 Automatic merge from release/2.6.0 -> release/2.7.0 ...

* commit '84d91f281103767b964a6b09aeba85c854a59c5e':
  修正一些错误信息描述

2019-03-07 16:57:59 +08:00

..

models

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

options

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

service

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

tasks

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

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

torrent

temp commit

2019-01-30 21:06:48 +08:00

usages

recode quota and usage for image service

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