]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1db2388 867bf04)
Merge PR #44228 into master
authorSage Weil <sage@newdream.net>
Fri, 17 Dec 2021 04:54:25 +0000 (23:54 -0500)
committerSage Weil <sage@newdream.net>
Fri, 17 Dec 2021 04:54:25 +0000 (23:54 -0500)
* refs/pull/44228/head:
qa/suites/orch/cephadm/osds: test 'ceph cephadm osd activate'
mgr/cephadm/services/osd: skip found osds that already have daemons
mgr/cephadm: allow activation of OSDs that have previously started

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
1  2 
src/pybind/mgr/cephadm/module.py patch | diff1 | diff2 | blob | history

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.