]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Sun, 16 Jun 2013 03:48:32 +0000 (20:48 -0700)
committerSage Weil <sage@inktank.com>
Sun, 16 Jun 2013 03:48:32 +0000 (20:48 -0700)

Trivial merge