]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'msgr' into unstable
authorSage Weil <sage@newdream.net>
Tue, 30 Mar 2010 18:45:00 +0000 (11:45 -0700)
committerSage Weil <sage@newdream.net>
Tue, 30 Mar 2010 18:45:00 +0000 (11:45 -0700)

Trivial merge