Merge pull request #11263 from liewegas/wip-bluestore-reshard-slop

author Sage Weil <sage@redhat.com>

Fri, 30 Sep 2016 14:41:46 +0000 (09:41 -0500)

committer GitHub <noreply@github.com>

Fri, 30 Sep 2016 14:41:46 +0000 (09:41 -0500)
author Sage Weil <sage@redhat.com>
Fri, 30 Sep 2016 14:41:46 +0000 (09:41 -0500)
committer GitHub <noreply@github.com>
Fri, 30 Sep 2016 14:41:46 +0000 (09:41 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 30 Sep 2016 14:41:46 +0000 (09:41 -0500)
committer	GitHub <noreply@github.com>
	Fri, 30 Sep 2016 14:41:46 +0000 (09:41 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history