]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f41de0b 57c6e51)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.