Merge pull request #15658 from xiexingguo/wip-fix-reshard

author Sage Weil <sage@newdream.net>

Sat, 17 Jun 2017 21:21:28 +0000 (16:21 -0500)

committer GitHub <noreply@github.com>

Sat, 17 Jun 2017 21:21:28 +0000 (16:21 -0500)
author Sage Weil <sage@newdream.net>
Sat, 17 Jun 2017 21:21:28 +0000 (16:21 -0500)
committer GitHub <noreply@github.com>
Sat, 17 Jun 2017 21:21:28 +0000 (16:21 -0500)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 17 Jun 2017 21:21:28 +0000 (16:21 -0500)
committer	GitHub <noreply@github.com>
	Sat, 17 Jun 2017 21:21:28 +0000 (16:21 -0500)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history