]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01da68a da66c66)
Merge PR #33465 into master
authorSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 20:40:05 +0000 (14:40 -0600)
committerSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 20:40:05 +0000 (14:40 -0600)
commit0eda6ca83d513a06c71e42d788284c068511963d
treed9bb1db8998bbe1d7c40b00cff88dc1ede048b2ctree | snapshot
parent01da68a753e6cb8fdfd10173a00e6444024242eacommit | diff
parentda66c662386841b86d0c200d92091ebddb083cfdcommit | diff
Merge PR #33465 into master

* refs/pull/33465/head:
mgr/cephadm: implement placement by label
mgr/cephadm: fix self.log call in get_unique_name
mgr/cephadm: fix NodePlacement host names
mgr/tests/test_orchestrator: test PlacementSpec parsing
mgr/orch: remove label: prefix when parsing placementspec
mgr/orch: PlacementSpec: add all_hosts property

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