]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Thu, 16 Aug 2012 20:21:39 +0000 (13:21 -0700)
committerSage Weil <sage@inktank.com>
Thu, 16 Aug 2012 20:21:39 +0000 (13:21 -0700)

Trivial merge