From: Sage Weil <sage@redhat.com>
Date: Thu, 31 Oct 2019 15:40:59 +0000 (-0500)
Subject: Merge PR #31270 into master
X-Git-Tag: v15.1.0~1098
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46867fd67bb4db0ae33b497b5936c91215fdb28f;p=ceph.git

Merge PR #31270 into master

* refs/pull/31270/head:
	ceph-daemon: no extra newline needed in authorized_keys file
	ceph-daemon: use client.admin keyring during bootstrap

Reviewed-by: Alfredo Deza <adeza@redhat.com>
---

46867fd67bb4db0ae33b497b5936c91215fdb28f