From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 10 Oct 2019 16:57:48 +0000 (-0700)
Subject: Merge PR #1322 into master
X-Git-Tag: 1.1.0~215
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b673b37fdc44c2fa7d5d48e361b45a3b6fa987c;p=teuthology.git

Merge PR #1322 into master

* refs/pull/1322/head:
	add note that ceph.conf.template should no longer be modified

Reviewed-by: Sage Weil <sage@redhat.com>
---

0b673b37fdc44c2fa7d5d48e361b45a3b6fa987c