Merge pull request #4162 from athanatos/wip-11156

author Sage Weil <sage@redhat.com>

Tue, 24 Mar 2015 19:15:21 +0000 (12:15 -0700)

committer Sage Weil <sage@redhat.com>

Tue, 24 Mar 2015 19:15:21 +0000 (12:15 -0700)
author Sage Weil <sage@redhat.com>
Tue, 24 Mar 2015 19:15:21 +0000 (12:15 -0700)
committer Sage Weil <sage@redhat.com>
Tue, 24 Mar 2015 19:15:21 +0000 (12:15 -0700)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 24 Mar 2015 19:15:21 +0000 (12:15 -0700)
committer	Sage Weil <sage@redhat.com>
	Tue, 24 Mar 2015 19:15:21 +0000 (12:15 -0700)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history