]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40938 into master
authorSage Weil <sage@newdream.net>
Thu, 22 Apr 2021 02:12:32 +0000 (22:12 -0400)
committerSage Weil <sage@newdream.net>
Thu, 22 Apr 2021 02:12:32 +0000 (22:12 -0400)
* refs/pull/40938/head:
mgr/cephadm: less noise about osd specs
mgr/cephadm: kick serve loop when adding/removing labels
mgr/cephadm: do not place osds on _no_schedule hosts
doc/cephadm: document _no_schedule label
mgr/cephadm: fix 'orch ls' count to reflect schedulable hosts
mgr/cephadm: do not schedule on _no_schedule hosts

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>

Trivial merge