From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 4 Jun 2019 23:21:22 +0000 (-0700)
Subject: Merge PR #28148 into master
X-Git-Tag: v15.1.0~2560
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f256c848d133fbfa6879a0fcb1f45eb5d6d980b6;p=ceph-ci.git

Merge PR #28148 into master

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

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

f256c848d133fbfa6879a0fcb1f45eb5d6d980b6