Merge pull request #11206 from dzafman/wip-16474

author David Zafman <dzafman@redhat.com>

Mon, 10 Oct 2016 20:55:16 +0000 (13:55 -0700)

committer GitHub <noreply@github.com>

Mon, 10 Oct 2016 20:55:16 +0000 (13:55 -0700)
author David Zafman <dzafman@redhat.com>
Mon, 10 Oct 2016 20:55:16 +0000 (13:55 -0700)
committer GitHub <noreply@github.com>
Mon, 10 Oct 2016 20:55:16 +0000 (13:55 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	David Zafman <dzafman@redhat.com>
	Mon, 10 Oct 2016 20:55:16 +0000 (13:55 -0700)
committer	GitHub <noreply@github.com>
	Mon, 10 Oct 2016 20:55:16 +0000 (13:55 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history