]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'osd_msgr' into unstable
authorSage Weil <sage@newdream.net>
Mon, 22 Nov 2010 17:55:37 +0000 (09:55 -0800)
committerSage Weil <sage@newdream.net>
Mon, 22 Nov 2010 17:55:37 +0000 (09:55 -0800)

Trivial merge