]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25818 into master
authorSage Weil <sage@redhat.com>
Tue, 8 Jan 2019 20:15:28 +0000 (14:15 -0600)
committerSage Weil <sage@redhat.com>
Tue, 8 Jan 2019 20:15:28 +0000 (14:15 -0600)
* refs/pull/25818/head:
mon: adjust mon sync, extra_probe_peers to use addrvec

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge