]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #36872 from callithea/wip-46972-octopus
authorLenz Grimmer <lgrimmer@suse.com>
Tue, 22 Sep 2020 11:48:50 +0000 (13:48 +0200)
committerGitHub <noreply@github.com>
Tue, 22 Sep 2020 11:48:50 +0000 (13:48 +0200)
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Trivial merge