Qiu Jian bb9991100e Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-server-change-ipaddr ...

Conflicts:
	pkg/mcclient/modules/joint.go

2019-01-28 22:23:49 +08:00

..

doc.go

diskhandler: local disk create, delete, resize

2019-01-07 17:09:57 +08:00

hostutils.go

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-server-change-ipaddr

2019-01-28 22:23:49 +08:00