Merge pull request #11772 from liewegas/wip-sortbitwise

author Sage Weil <sage@redhat.com>

Sat, 5 Nov 2016 12:57:17 +0000 (07:57 -0500)

committer GitHub <noreply@github.com>

Sat, 5 Nov 2016 12:57:17 +0000 (07:57 -0500)
author Sage Weil <sage@redhat.com>
Sat, 5 Nov 2016 12:57:17 +0000 (07:57 -0500)
committer GitHub <noreply@github.com>
Sat, 5 Nov 2016 12:57:17 +0000 (07:57 -0500)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 5 Nov 2016 12:57:17 +0000 (07:57 -0500)
committer	GitHub <noreply@github.com>
	Sat, 5 Nov 2016 12:57:17 +0000 (07:57 -0500)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history