]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@newdream.net>
Fri, 17 Feb 2012 05:00:49 +0000 (21:00 -0800)
committerSage Weil <sage@newdream.net>
Fri, 17 Feb 2012 05:00:49 +0000 (21:00 -0800)

Trivial merge