]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31505 into master
authorSage Weil <sage@redhat.com>
Sun, 10 Nov 2019 02:38:49 +0000 (20:38 -0600)
committerSage Weil <sage@redhat.com>
Sun, 10 Nov 2019 02:38:49 +0000 (20:38 -0600)
* refs/pull/31505/head:
mgr/ssh: take IP, CIDR, or addrvec for new mon(s)

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

Simple merge