]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit0dd11a5aa5f2696ccdf74c6d5c3a540d78374b27
tree0b9968c48b8bb80265056ef3df96ca0266ff0fb9
parentaffc79bdcf7aa20097463a362a6dfb815eaa11ec
parent436df900b4d866b8f891d4f36cfa65ed670e9f0b
Merge PR #33523 into master

* 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>