Merge pull request #2540 from ceph/wip-giant-messenger-fixes

author Sage Weil <sage@redhat.com>

Thu, 25 Sep 2014 20:01:38 +0000 (13:01 -0700)

committer Sage Weil <sage@redhat.com>

Thu, 25 Sep 2014 20:01:38 +0000 (13:01 -0700)
author Sage Weil <sage@redhat.com>
Thu, 25 Sep 2014 20:01:38 +0000 (13:01 -0700)
committer Sage Weil <sage@redhat.com>
Thu, 25 Sep 2014 20:01:38 +0000 (13:01 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 25 Sep 2014 20:01:38 +0000 (13:01 -0700)
committer	Sage Weil <sage@redhat.com>
	Thu, 25 Sep 2014 20:01:38 +0000 (13:01 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history