From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 25 Sep 2020 15:37:57 +0000 (+0200)
Subject: Merge pull request #37408 from idryomov/wip-krbd-read-only-override-octopus
X-Git-Tag: v15.2.9~122^2~100
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42d2a713bb1357f45b4884e77af232e6b0c2e376;p=ceph.git

Merge pull request #37408 from idryomov/wip-krbd-read-only-override-octopus

octopus: rbd: make common options override krbd-specific options

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

42d2a713bb1357f45b4884e77af232e6b0c2e376