From: Sage Weil <sage@newdream.net>
Date: Sat, 23 Jan 2021 17:03:10 +0000 (-0600)
Subject: Merge PR #38974 into master
X-Git-Tag: v17.1.0~3193
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6fba10f7f6af069b930878ae655bae65be05e9e;p=ceph.git

Merge PR #38974 into master

* refs/pull/38974/head:
	qa/suites/rados/cephadm/upgrade: avoid allow_ptrace with old cephadm

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

c6fba10f7f6af069b930878ae655bae65be05e9e