Merge pull request #7510 from athanatos/wip-14278

author Sage Weil <sage@redhat.com>

Thu, 4 Feb 2016 21:06:35 +0000 (16:06 -0500)

committer Sage Weil <sage@redhat.com>

Thu, 4 Feb 2016 21:06:35 +0000 (16:06 -0500)
author Sage Weil <sage@redhat.com>
Thu, 4 Feb 2016 21:06:35 +0000 (16:06 -0500)
committer Sage Weil <sage@redhat.com>
Thu, 4 Feb 2016 21:06:35 +0000 (16:06 -0500)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 4 Feb 2016 21:06:35 +0000 (16:06 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 4 Feb 2016 21:06:35 +0000 (16:06 -0500)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history