]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorJosh Durgin <jdurgin@redhat.com>
Thu, 18 Jun 2015 03:16:06 +0000 (20:16 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 18 Jun 2015 03:16:06 +0000 (20:16 -0700)

Trivial merge