From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Dec 2019 19:50:42 +0000 (-0600)
Subject: Merge PR #32250 into master
X-Git-Tag: v15.1.0~506
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dc7d0c2122d1d71b74c69a6eac3fa9f5eb82f5d0;p=ceph.git

Merge PR #32250 into master

* refs/pull/32250/head:
	mgr/cephadm: fix temp file prefixes
	qa: fix lingering ceph-mgr-ssh -> ceph-mgr-cephadm refs

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

dc7d0c2122d1d71b74c69a6eac3fa9f5eb82f5d0