]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 53a5d1f d3b9a22)
Merge PR #33098 into master
authorSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 01:12:43 +0000 (19:12 -0600)
committerSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 01:12:43 +0000 (19:12 -0600)
commit0584db6221d8206e465eb7b08950404ee88cc9de
treec0936a909e6869ae744bf77a46c7d4d789326958tree | snapshot
parent53a5d1f4ec8e4f590f667aacae5cc00c5f83d29fcommit | diff
parentd3b9a2252c56565952a891832df9020aaeccf72ccommit | diff
Merge PR #33098 into master

* refs/pull/33098/head:
mgr/orch,cephadm: add 'host set-addr'
mgr/orch: include addr (and labels) in 'host ls'
mgr/cephadm: fix 'cephadm check-host'
mgr/cephadm: use addr to contact host
mgr/orch: pass HostSpec to add_host
mgr/orch: HostSpec -> HostPlacementSpec

Reviewed-by: Sebastian Wagner <swagner@suse.com>
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
src/pybind/mgr/orchestrator_cli/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.