From: Sage Weil <sage@newdream.net>
Date: Fri, 9 Apr 2021 23:04:33 +0000 (-0500)
Subject: Merge PR #40663 into pacific
X-Git-Tag: v16.2.2~6^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=50f1821b4caa22e3a2ca880c14f02061498aa47a;p=ceph.git

Merge PR #40663 into pacific

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

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

50f1821b4caa22e3a2ca880c14f02061498aa47a