]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Fri, 3 May 2013 18:36:42 +0000 (11:36 -0700)
committerSage Weil <sage@inktank.com>
Fri, 3 May 2013 18:36:42 +0000 (11:36 -0700)

Trivial merge