Merge pull request #18983 from pdvian/wip-22150-luminous

author Sage Weil <sage@newdream.net>

Sun, 19 Nov 2017 02:34:50 +0000 (20:34 -0600)

committer GitHub <noreply@github.com>

Sun, 19 Nov 2017 02:34:50 +0000 (20:34 -0600)
author Sage Weil <sage@newdream.net>
Sun, 19 Nov 2017 02:34:50 +0000 (20:34 -0600)
committer GitHub <noreply@github.com>
Sun, 19 Nov 2017 02:34:50 +0000 (20:34 -0600)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sun, 19 Nov 2017 02:34:50 +0000 (20:34 -0600)
committer	GitHub <noreply@github.com>
	Sun, 19 Nov 2017 02:34:50 +0000 (20:34 -0600)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history