]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #37408 from idryomov/wip-krbd-read-only-override-octopus
authorIlya Dryomov <idryomov@gmail.com>
Fri, 25 Sep 2020 15:37:57 +0000 (17:37 +0200)
committerGitHub <noreply@github.com>
Fri, 25 Sep 2020 15:37:57 +0000 (17:37 +0200)
octopus: rbd: make common options override krbd-specific options

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Trivial merge