]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'luminous' into wip-ifed-fix2-expand-luminous 25384/head
authorJosh Durgin <jdurgin@redhat.com>
Mon, 14 Jan 2019 21:12:58 +0000 (13:12 -0800)
committerGitHub <noreply@github.com>
Mon, 14 Jan 2019 21:12:58 +0000 (13:12 -0800)

Trivial merge