]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #22447 into master
authorSage Weil <sage@redhat.com>
Thu, 7 Jun 2018 22:25:48 +0000 (17:25 -0500)
committerSage Weil <sage@redhat.com>
Thu, 7 Jun 2018 22:25:48 +0000 (17:25 -0500)
* refs/pull/22447/head:
osd/OSDMap: fix pre-addrvec compat
mon/MgrMap: fix pre-addrvec compat
messages/MMgrBeacon: fix pre-addrvec compat

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge