]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorJosh Durgin <jdurgin@redhat.com>
Mon, 15 Jun 2015 22:48:08 +0000 (15:48 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Mon, 15 Jun 2015 22:48:08 +0000 (15:48 -0700)

Trivial merge