]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33126 into master
authorSage Weil <sage@redhat.com>
Sun, 9 Feb 2020 21:36:32 +0000 (15:36 -0600)
committerSage Weil <sage@redhat.com>
Sun, 9 Feb 2020 21:36:32 +0000 (15:36 -0600)
* refs/pull/33126/head:
doc/mgr/orchestrator_cli: update support table
mgr/deepsea: remove
mgr/ansible: remove

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/mon/OSDMonitor.cc
src/pybind/mgr/orchestrator_cli/module.py

Simple merge