Merge pull request #4458 from wonzhq/dup-promote

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

Fri, 10 Jul 2015 00:10:10 +0000 (17:10 -0700)

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

Fri, 10 Jul 2015 00:10:10 +0000 (17:10 -0700)
author Samuel Just <sam.just@inktank.com>
Fri, 10 Jul 2015 00:10:10 +0000 (17:10 -0700)
committer Samuel Just <sam.just@inktank.com>
Fri, 10 Jul 2015 00:10:10 +0000 (17:10 -0700)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/test/osd/RadosModel.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Fri, 10 Jul 2015 00:10:10 +0000 (17:10 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Fri, 10 Jul 2015 00:10:10 +0000 (17:10 -0700)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/osd/RadosModel.h	patch \|	diff1 \|	diff2 \|	blob \| history