]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Mon, 24 Sep 2012 20:16:23 +0000 (13:16 -0700)
committerSage Weil <sage@inktank.com>
Mon, 24 Sep 2012 20:16:23 +0000 (13:16 -0700)

Trivial merge