Merge PR #24732 into master

author Sage Weil <sage@redhat.com>

Mon, 26 Nov 2018 15:21:22 +0000 (09:21 -0600)

committer Sage Weil <sage@redhat.com>

Mon, 26 Nov 2018 15:21:22 +0000 (09:21 -0600)
author Sage Weil <sage@redhat.com>
Mon, 26 Nov 2018 15:21:22 +0000 (09:21 -0600)
committer Sage Weil <sage@redhat.com>
Mon, 26 Nov 2018 15:21:22 +0000 (09:21 -0600)
diff --cc src/os/bluestore/BlueFS.cc
Simple merge
diff --cc src/os/bluestore/BlueFS.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 26 Nov 2018 15:21:22 +0000 (09:21 -0600)
committer	Sage Weil <sage@redhat.com>
	Mon, 26 Nov 2018 15:21:22 +0000 (09:21 -0600)
		1	2
src/os/bluestore/BlueFS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueFS.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history