]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@newdream.net>
Fri, 12 Aug 2011 17:33:42 +0000 (10:33 -0700)
committerSage Weil <sage@newdream.net>
Fri, 12 Aug 2011 17:33:42 +0000 (10:33 -0700)

Trivial merge