Merge pull request #6120 from athanatos/wip-13185

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

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

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

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