From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 17 Dec 2020 17:23:51 +0000 (-0800)
Subject: Merge pull request #38340 from smithfarm/wip-48084-octopus
X-Git-Tag: v15.2.9~127
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b078e1e6c347dd1da087a6c7fbfe5db3148be69c;p=ceph.git

Merge pull request #38340 from smithfarm/wip-48084-octopus

octopus: global: reexpand conf meta in child process

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

b078e1e6c347dd1da087a6c7fbfe5db3148be69c