]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Fri, 27 Jun 2014 19:55:44 +0000 (12:55 -0700)
committerSage Weil <sage@inktank.com>
Fri, 27 Jun 2014 19:55:44 +0000 (12:55 -0700)

Trivial merge