Merge pull request #3919 from guangyy/wip-9558

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

Fri, 1 May 2015 14:27:26 +0000 (07:27 -0700)

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

Fri, 1 May 2015 14:27:26 +0000 (07:27 -0700)
author Samuel Just <sam.just@inktank.com>
Fri, 1 May 2015 14:27:26 +0000 (07:27 -0700)
committer Samuel Just <sam.just@inktank.com>
Fri, 1 May 2015 14:27:26 +0000 (07:27 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Fri, 1 May 2015 14:27:26 +0000 (07:27 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Fri, 1 May 2015 14:27:26 +0000 (07:27 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history