]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit35512c17c255bf0cb741dc032995b1fefdfece0f
tree3cdd9adfb554f33a6f828df97e2d87dd9641517a
parent2e9edae1a14e48707512be278bc17c72e843ee4a
parentfc2e7650799c07395492fae4c7b3357e486caa70
Merge PR #31505 into master

* refs/pull/31505/head:
mgr/ssh: take IP, CIDR, or addrvec for new mon(s)

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