]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f21e41 befcff0)
Merge remote branch 'origin/stable' into next
authorSage Weil <sage@newdream.net>
Mon, 6 Jun 2011 16:57:41 +0000 (09:57 -0700)
committerSage Weil <sage@newdream.net>
Mon, 6 Jun 2011 16:57:41 +0000 (09:57 -0700)
1  2 
src/msg/SimpleMessenger.cc patch | diff1 | diff2 | blob | history

diff --cc src/msg/SimpleMessenger.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.