Merge pull request #10135 from david-z/wip-enhance-ceph-disk-bluestore

author Loic Dachary <loic@dachary.org>

Thu, 22 Sep 2016 16:13:00 +0000 (18:13 +0200)

committer GitHub <noreply@github.com>

Thu, 22 Sep 2016 16:13:00 +0000 (18:13 +0200)
author Loic Dachary <loic@dachary.org>
Thu, 22 Sep 2016 16:13:00 +0000 (18:13 +0200)
committer GitHub <noreply@github.com>
Thu, 22 Sep 2016 16:13:00 +0000 (18:13 +0200)
diff --cc qa/workunits/ceph-disk/ceph-disk-test.py
Simple merge
diff --cc src/ceph-disk/ceph_disk/main.py
Simple merge
author	Loic Dachary <loic@dachary.org>
	Thu, 22 Sep 2016 16:13:00 +0000 (18:13 +0200)
committer	GitHub <noreply@github.com>
	Thu, 22 Sep 2016 16:13:00 +0000 (18:13 +0200)
		1	2
qa/workunits/ceph-disk/ceph-disk-test.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-disk/ceph_disk/main.py	patch \|	diff1 \|	diff2 \|	blob \| history