]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Tue, 21 Aug 2012 17:51:54 +0000 (10:51 -0700)
committerSage Weil <sage@inktank.com>
Tue, 21 Aug 2012 17:51:54 +0000 (10:51 -0700)

Trivial merge