Merge pull request #7196 from liewegas/wip-bluestore

author Sage Weil <sage@redhat.com>

Thu, 14 Jan 2016 23:57:57 +0000 (18:57 -0500)

committer Sage Weil <sage@redhat.com>

Thu, 14 Jan 2016 23:57:57 +0000 (18:57 -0500)
author Sage Weil <sage@redhat.com>
Thu, 14 Jan 2016 23:57:57 +0000 (18:57 -0500)
committer Sage Weil <sage@redhat.com>
Thu, 14 Jan 2016 23:57:57 +0000 (18:57 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/bluestore/BlockDevice.cc
Simple merge
diff --cc src/os/bluestore/BlueFS.cc
Simple merge
diff --cc src/os/kstore/KStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 14 Jan 2016 23:57:57 +0000 (18:57 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 14 Jan 2016 23:57:57 +0000 (18:57 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlockDevice.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueFS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/kstore/KStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history