Merge pull request #6117 from athanatos/wip-12990

author Samuel Just <sam.just@inktank.com>

Wed, 30 Sep 2015 17:15:48 +0000 (10:15 -0700)

committer Samuel Just <sam.just@inktank.com>

Wed, 30 Sep 2015 17:15:48 +0000 (10:15 -0700)
author Samuel Just <sam.just@inktank.com>
Wed, 30 Sep 2015 17:15:48 +0000 (10:15 -0700)
committer Samuel Just <sam.just@inktank.com>
Wed, 30 Sep 2015 17:15:48 +0000 (10:15 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Wed, 30 Sep 2015 17:15:48 +0000 (10:15 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Wed, 30 Sep 2015 17:15:48 +0000 (10:15 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history