]> 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: 74fd8e7 acbda9d)
Merge PR #34027 into octopus 34060/head
authorSage Weil <sage@redhat.com>
Thu, 19 Mar 2020 13:22:40 +0000 (08:22 -0500)
committerSage Weil <sage@redhat.com>
Thu, 19 Mar 2020 13:22:40 +0000 (08:22 -0500)
commit3ed3f34b9801edf2529295b008b27adee1965640
treeb21dcbce6b98563ac495c79565ec5b93350e6d8etree | snapshot
parent74fd8e7aa327ef16ff444d722d713139a3550367commit | diff
parentacbda9d19d75e45ee30bd1ea6de6f5bd561dbf19commit | diff
Merge PR #34027 into octopus

* refs/pull/34027/head:
qa/workunits/cephadm/test_cephadm: mark services unmanaged for test
mgr/cephadm: do not reconfig unmanaged services
qa/workunits/cephadm/test_cephadm: output file for pub key

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.