Merge pull request #18401 from liewegas/wip-bluestore-label-luminous

author Sage Weil <sage@newdream.net>

Sat, 21 Oct 2017 04:08:58 +0000 (23:08 -0500)

committer GitHub <noreply@github.com>

Sat, 21 Oct 2017 04:08:58 +0000 (23:08 -0500)
author Sage Weil <sage@newdream.net>
Sat, 21 Oct 2017 04:08:58 +0000 (23:08 -0500)
committer GitHub <noreply@github.com>
Sat, 21 Oct 2017 04:08:58 +0000 (23:08 -0500)
diff --cc ceph.spec.in
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 21 Oct 2017 04:08:58 +0000 (23:08 -0500)
committer	GitHub <noreply@github.com>
	Sat, 21 Oct 2017 04:08:58 +0000 (23:08 -0500)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history