]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1883 from ceph/wip-msgr
authorSage Weil <sage@inktank.com>
Tue, 5 Aug 2014 15:50:05 +0000 (08:50 -0700)
committerSage Weil <sage@inktank.com>
Tue, 5 Aug 2014 15:50:05 +0000 (08:50 -0700)
messenger refactoring for xio

Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/mds/MDCache.cc
src/mds/MDS.cc
src/mon/MDSMonitor.cc
src/mon/OSDMonitor.cc
src/mon/PGMonitor.cc
src/msg/SimpleMessenger.cc
src/osd/OSD.cc
src/osd/ReplicatedPG.cc

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