From: Kefu Chai <kchai@redhat.com>
Date: Mon, 30 Nov 2020 23:12:43 +0000 (+0800)
Subject: Merge pull request #38281 from tchaikov/wip-mgr-no-kv-options
X-Git-Tag: v16.1.0~441
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e59c088e3b7fba6d5954964db2accaaade195526;p=ceph.git

Merge pull request #38281 from tchaikov/wip-mgr-no-kv-options

mgr: do not migrate conf from config-key store to new-style conf

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

e59c088e3b7fba6d5954964db2accaaade195526