From: Sage Weil <sage@newdream.net>
Date: Tue, 6 Apr 2021 21:28:08 +0000 (-0400)
Subject: Merge PR #40603 into master
X-Git-Tag: v17.1.0~2344
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e96806aea89129bf23a5f83bb02d33e86ee8a2f;p=ceph.git

Merge PR #40603 into master

* refs/pull/40603/head:
	qa/tasks/ceph.conf: shorten cephx TTL for testing

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
---

9e96806aea89129bf23a5f83bb02d33e86ee8a2f