]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33523 into master
authorSage Weil <sage@redhat.com>
Mon, 2 Mar 2020 16:30:03 +0000 (10:30 -0600)
committerSage Weil <sage@redhat.com>
Mon, 2 Mar 2020 16:30:03 +0000 (10:30 -0600)
* refs/pull/33523/head:
mgr/orch: ServiceSpec: drop 'count'
mgr/rook: use spec.placement.count (instead of spec.count)
mgr/cephadm: make HostAssignment make sense
mgr/orch: PlacementSpec: do not combine all_hosts with anything else
mgr/orch: use PlacementSpec.from_strings() for all CLI commands

Reviewed-by: Joshua Schmid <jschmid@suse.de>

Trivial merge