]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9e0d4b 92ad142)
Merge PR #40508 into master
authorSage Weil <sage@newdream.net>
Mon, 5 Apr 2021 18:14:12 +0000 (14:14 -0400)
committerSage Weil <sage@newdream.net>
Mon, 5 Apr 2021 18:14:12 +0000 (14:14 -0400)
* refs/pull/40508/head:
mgr/cephadm: fix orch host add with multiple labels and no addr

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/pybind/mgr/cephadm/serve.py patch | diff1 | diff2 | blob | history

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