]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #31270 into master
authorSage Weil <sage@redhat.com>
Thu, 31 Oct 2019 15:40:59 +0000 (10:40 -0500)
committerSage Weil <sage@redhat.com>
Thu, 31 Oct 2019 15:40:59 +0000 (10:40 -0500)
commit46867fd67bb4db0ae33b497b5936c91215fdb28f
tree14c1091304702d47f79d078ca95f5131bd2bc7a1
parentf41de0bec1a8da98107dbdae1801e8b6579deda3
parent57c6e51755da82d4eafd82690765e2589d8a277c
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>