]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39482 into master
authorSage Weil <sage@newdream.net>
Mon, 15 Feb 2021 21:25:01 +0000 (16:25 -0500)
committerSage Weil <sage@newdream.net>
Mon, 15 Feb 2021 21:25:01 +0000 (16:25 -0500)
* refs/pull/39482/head:
Revert "Merge pull request #37764 from mgfritch/cephadm-no-container-init"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py

Simple merge
Simple merge
Simple merge