From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 7 Oct 2019 19:30:10 +0000 (-0700)
Subject: Merge PR #29225 into mimic
X-Git-Tag: v13.2.7~141
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afd4cb7f25453d024e4c8ff2de78fcba3e891b5a;p=ceph.git

Merge PR #29225 into mimic

* refs/pull/29225/head:
	common/secret.c: fix key parsing when doing a remount

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

afd4cb7f25453d024e4c8ff2de78fcba3e891b5a