Merge pull request #9305 from xiexingguo/xxg-wip-replicatedpg-fixup

author Samuel Just <sjust@redhat.com>

Thu, 23 Jun 2016 20:01:45 +0000 (13:01 -0700)

committer GitHub <noreply@github.com>

Thu, 23 Jun 2016 20:01:45 +0000 (13:01 -0700)
author Samuel Just <sjust@redhat.com>
Thu, 23 Jun 2016 20:01:45 +0000 (13:01 -0700)
committer GitHub <noreply@github.com>
Thu, 23 Jun 2016 20:01:45 +0000 (13:01 -0700)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Thu, 23 Jun 2016 20:01:45 +0000 (13:01 -0700)
committer	GitHub <noreply@github.com>
	Thu, 23 Jun 2016 20:01:45 +0000 (13:01 -0700)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history