]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-paranoid' into next
authorSage Weil <sage@inktank.com>
Thu, 2 May 2013 17:18:39 +0000 (10:18 -0700)
committerSage Weil <sage@inktank.com>
Thu, 2 May 2013 17:18:39 +0000 (10:18 -0700)

Trivial merge