Merge pull request #7218 from dachary/wip-13942-ceph-disk

author Sage Weil <sage@redhat.com>

Fri, 5 Feb 2016 14:15:26 +0000 (09:15 -0500)

committer Sage Weil <sage@redhat.com>

Fri, 5 Feb 2016 14:15:26 +0000 (09:15 -0500)
author Sage Weil <sage@redhat.com>
Fri, 5 Feb 2016 14:15:26 +0000 (09:15 -0500)
committer Sage Weil <sage@redhat.com>
Fri, 5 Feb 2016 14:15:26 +0000 (09:15 -0500)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/test/CMakeLists.txt
Simple merge
diff --cc src/test/Makefile.am
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 5 Feb 2016 14:15:26 +0000 (09:15 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 5 Feb 2016 14:15:26 +0000 (09:15 -0500)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history