Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181113-2.2.0

Browse Source

Conflicts:
	pkg/compute/guestdrivers/aliyun.go

...

This commit is contained in:

Qiu Jian

2018-11-13 12:06:33 +08:00

parent 5fb53912d8 c3371298f5

commit fbf31b2f13

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