Merge pull request #8486 from liewegas/wip-14695

author Sage Weil <sage@redhat.com>

Sat, 9 Apr 2016 17:33:54 +0000 (13:33 -0400)

committer Sage Weil <sage@redhat.com>

Sat, 9 Apr 2016 17:33:54 +0000 (13:33 -0400)
author Sage Weil <sage@redhat.com>
Sat, 9 Apr 2016 17:33:54 +0000 (13:33 -0400)
committer Sage Weil <sage@redhat.com>
Sat, 9 Apr 2016 17:33:54 +0000 (13:33 -0400)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 9 Apr 2016 17:33:54 +0000 (13:33 -0400)
committer	Sage Weil <sage@redhat.com>
	Sat, 9 Apr 2016 17:33:54 +0000 (13:33 -0400)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history