]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Tue, 24 Jul 2012 18:49:41 +0000 (11:49 -0700)
committerSage Weil <sage@inktank.com>
Tue, 24 Jul 2012 18:49:41 +0000 (11:49 -0700)

Trivial merge