]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #25900 into master
authorSage Weil <sage@redhat.com>
Fri, 18 Jan 2019 03:02:59 +0000 (21:02 -0600)
committerSage Weil <sage@redhat.com>
Fri, 18 Jan 2019 03:02:59 +0000 (21:02 -0600)
commit71d629b5a5c78bdfca9460908b59a067fdd74798
treef9c2176a6e0fd32903f0753ad47f5cc78b5d10d8
parent39f9e8db4dc7f8bfcb01a9ad20b8961c36138f4f
parent236c8a45282247a422ddb75df711687bf7357b82
Merge PR #25900 into master

* refs/pull/25900/head:
qa/tasks/ceph.py: bracket addrvecs in mon_host etc
vstart.sh: bracket addrvec on mon_host for msgr2-only mode
unittest_addrs: entity_addr_t: strengthen tests slightly
common/ceph_argparse: make parse_ip_port_vec handle list of addrs or addrvecs
common/ceph_argparse: parse_ip_port_vec returns addrvecs, not addrds
msg/msg_types: entity_addrvec_t: require brackets for size >1
msg/msg_types: entity_addrvec_t: allow brackets when parsing addrvec to match output
msg/msg_types: entity_addrvec_t: allow only ',' as an addrvec separator
msg/msg_types: entity_addr_t: we should not parse an addrvec
msg/msg_types: entity_addr_t: fix empty string parse cases
msg/msg_types: entity_addr_t: is_ipv6() and is_ipv4()

Reviewed-by: Ricardo Dias <rdias@suse.com>
src/msg/msg_types.h
src/test/test_addrs.cc