Merge pull request #6158 from dachary/wip-13336-hammer

author Loic Dachary <loic@dachary.org>

Mon, 16 Nov 2015 17:06:12 +0000 (18:06 +0100)

committer Loic Dachary <loic@dachary.org>

Mon, 16 Nov 2015 17:06:12 +0000 (18:06 +0100)
author Loic Dachary <loic@dachary.org>
Mon, 16 Nov 2015 17:06:12 +0000 (18:06 +0100)
committer Loic Dachary <loic@dachary.org>
Mon, 16 Nov 2015 17:06:12 +0000 (18:06 +0100)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Loic Dachary <loic@dachary.org>
	Mon, 16 Nov 2015 17:06:12 +0000 (18:06 +0100)
committer	Loic Dachary <loic@dachary.org>
	Mon, 16 Nov 2015 17:06:12 +0000 (18:06 +0100)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history