]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af91565 33c843f)
Merge PR #40477 into master
authorSage Weil <sage@newdream.net>
Thu, 1 Apr 2021 14:07:02 +0000 (10:07 -0400)
committerSage Weil <sage@newdream.net>
Thu, 1 Apr 2021 14:07:02 +0000 (10:07 -0400)
* refs/pull/40477/head:
cephadm: fix failure when using --apply-spec and --shh-user

Reviewed-by: Adam King <adking@redhat.com>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history

diff --cc src/cephadm/cephadm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.