]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Sun, 30 Sep 2012 22:17:33 +0000 (15:17 -0700)
committerSage Weil <sage@inktank.com>
Sun, 30 Sep 2012 22:17:33 +0000 (15:17 -0700)

Trivial merge