Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recover-image-properties-at-startup

Browse Source

Conflicts:
	pkg/image/models/images.go

...

This commit is contained in:

Qiu Jian

2019-03-13 16:27:01 +08:00

parent af100016be 52ce7ddd10

commit a54cba7865

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available