Merge pull request #12268 from dzafman/wip-18113

author Samuel Just <sjust@redhat.com>

Wed, 14 Dec 2016 19:34:24 +0000 (11:34 -0800)

committer GitHub <noreply@github.com>

Wed, 14 Dec 2016 19:34:24 +0000 (11:34 -0800)
author Samuel Just <sjust@redhat.com>
Wed, 14 Dec 2016 19:34:24 +0000 (11:34 -0800)
committer GitHub <noreply@github.com>
Wed, 14 Dec 2016 19:34:24 +0000 (11:34 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Wed, 14 Dec 2016 19:34:24 +0000 (11:34 -0800)
committer	GitHub <noreply@github.com>
	Wed, 14 Dec 2016 19:34:24 +0000 (11:34 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history