]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>
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.