]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Wed, 25 Jul 2012 00:22:50 +0000 (17:22 -0700)
committerSage Weil <sage@inktank.com>
Wed, 25 Jul 2012 00:22:50 +0000 (17:22 -0700)

Trivial merge