]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #28148 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 4 Jun 2019 23:21:22 +0000 (16:21 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 4 Jun 2019 23:21:22 +0000 (16:21 -0700)
commitf256c848d133fbfa6879a0fcb1f45eb5d6d980b6
treef93bf254b59fb60e448979ce2b09258459a5dfbf
parentde762fe2df161d648c1b26375562c0931af11351
parentf44516bcde8d48ef5dca4f92017d1e241eb8e26e
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>