Merge pull request #9489 from athanatos/wip-16156

author David Zafman <dzafman@redhat.com>

Thu, 7 Jul 2016 15:57:53 +0000 (08:57 -0700)

committer GitHub <noreply@github.com>

Thu, 7 Jul 2016 15:57:53 +0000 (08:57 -0700)
author David Zafman <dzafman@redhat.com>
Thu, 7 Jul 2016 15:57:53 +0000 (08:57 -0700)
committer GitHub <noreply@github.com>
Thu, 7 Jul 2016 15:57:53 +0000 (08:57 -0700)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	David Zafman <dzafman@redhat.com>
	Thu, 7 Jul 2016 15:57:53 +0000 (08:57 -0700)
committer	GitHub <noreply@github.com>
	Thu, 7 Jul 2016 15:57:53 +0000 (08:57 -0700)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history