]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #18393 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Oct 2017 19:17:08 +0000 (12:17 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Oct 2017 19:17:08 +0000 (12:17 -0700)
* refs/pull/18393/head:
ceph_context: re-expand admin_socket metavariables in child process

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

Trivial merge