]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Fri, 17 May 2013 03:39:56 +0000 (20:39 -0700)
committerSage Weil <sage@inktank.com>
Fri, 17 May 2013 03:39:56 +0000 (20:39 -0700)

Trivial merge