From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Mar 2020 20:14:52 +0000 (-0600)
Subject: Merge PR #33647 into master
X-Git-Tag: v15.1.1~165
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=505f9a782d82854965917738e4586315974ff886;p=ceph.git

Merge PR #33647 into master

* refs/pull/33647/head:
	vstart.sh: fix install of cephadm ssh keys from ~/.ssh

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

505f9a782d82854965917738e4586315974ff886