From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 23 Oct 2019 15:31:21 +0000 (-0700)
Subject: Merge pull request #30841 from smithfarm/wip-42263-mimic
X-Git-Tag: v13.2.7~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d2a74df87626eedd2dd896c97b006d3fa852a41;p=ceph.git

Merge pull request #30841 from smithfarm/wip-42263-mimic

mimic: tests: do not take ceph.conf.template from ceph/teuthology.git

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

9d2a74df87626eedd2dd896c97b006d3fa852a41