From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 20 Apr 2021 09:01:15 +0000 (+0200)
Subject: Merge branch 'pacific-saved' into pacific
X-Git-Tag: v16.2.2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=502240a8bd669c783b88e2056cd7f8d308966303;p=ceph.git

Merge branch 'pacific-saved' into pacific

Conflicts:
	qa/tasks/ceph.conf.template [ commit 94df76244798
	  ("qa/tasks/ceph.conf: shorten cephx TTL for testing") was
	  cherry-picked to 16.2.0 separately and so exists both in
	  16.2.0 and pacific-saved ]
	qa/tasks/cephadm.conf [ ditto ]
---

502240a8bd669c783b88e2056cd7f8d308966303