]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2540 from ceph/wip-giant-messenger-fixes
authorSage Weil <sage@redhat.com>
Thu, 25 Sep 2014 20:01:38 +0000 (13:01 -0700)
committerSage Weil <sage@redhat.com>
Thu, 25 Sep 2014 20:01:38 +0000 (13:01 -0700)
giant messenger fixes

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/ReplicatedPG.cc

diff --cc src/osd/OSD.cc
Simple merge
Simple merge