]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit9200b1ea8e5e4309e435202948e61c9247d5ceff
tree576ac8e9187cc19a7148c3d30d96635f1b08a983
parente42bbba9ca82642ecca1e2b43b4fde246ea87ead
parentc896292d5841c10c87eac3948d71f9eec31fe5e5
Merge PR #39482 into master

* refs/pull/39482/head:
Revert "Merge pull request #37764 from mgfritch/cephadm-no-container-init"

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