Merge pull request #13321 from liewegas/wip-kill-sortbitwise-harder

author Sage Weil <sage@newdream.net>

Mon, 13 Feb 2017 16:43:56 +0000 (10:43 -0600)

committer GitHub <noreply@github.com>

Mon, 13 Feb 2017 16:43:56 +0000 (10:43 -0600)
author Sage Weil <sage@newdream.net>
Mon, 13 Feb 2017 16:43:56 +0000 (10:43 -0600)
committer GitHub <noreply@github.com>
Mon, 13 Feb 2017 16:43:56 +0000 (10:43 -0600)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 13 Feb 2017 16:43:56 +0000 (10:43 -0600)
committer	GitHub <noreply@github.com>
	Mon, 13 Feb 2017 16:43:56 +0000 (10:43 -0600)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history