]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
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)
* 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>

Trivial merge