]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSamuel Just <sam.just@inktank.com>
Wed, 15 Aug 2012 22:21:09 +0000 (15:21 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 15 Aug 2012 22:21:09 +0000 (15:21 -0700)
1  2 
src/msg/Message.h

Simple merge