]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-msgr-masterbits'
authorSage Weil <sage@inktank.com>
Sat, 28 Jul 2012 14:21:05 +0000 (07:21 -0700)
committerSage Weil <sage@inktank.com>
Sat, 28 Jul 2012 14:21:05 +0000 (07:21 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge