]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Fri, 8 Feb 2013 17:18:01 +0000 (09:18 -0800)
committerSage Weil <sage@inktank.com>
Fri, 8 Feb 2013 17:18:01 +0000 (09:18 -0800)

Trivial merge