]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@newdream.net>
Wed, 11 May 2011 18:42:27 +0000 (11:42 -0700)
committerSage Weil <sage@newdream.net>
Wed, 11 May 2011 18:42:27 +0000 (11:42 -0700)

Trivial merge