Merge pull request #11676 from asheplyakov/hammer-16151

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 23 Nov 2016 20:56:22 +0000 (21:56 +0100)

committer GitHub <noreply@github.com>

Wed, 23 Nov 2016 20:56:22 +0000 (21:56 +0100)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 23 Nov 2016 20:56:22 +0000 (21:56 +0100)
committer GitHub <noreply@github.com>
Wed, 23 Nov 2016 20:56:22 +0000 (21:56 +0100)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 23 Nov 2016 20:56:22 +0000 (21:56 +0100)
committer	GitHub <noreply@github.com>
	Wed, 23 Nov 2016 20:56:22 +0000 (21:56 +0100)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history