Merge branch 'master' of github.com:lielongxingkong/ceph_fabric

Conflicts:
	init_fabric.sh
Merge branch 'master' of github.com:lielongxingkong/ceph_fabric

Conflicts:
	init_fabric.sh