]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #26794 into master
authorSage Weil <sage@redhat.com>
Fri, 8 Mar 2019 04:12:52 +0000 (22:12 -0600)
committerSage Weil <sage@redhat.com>
Fri, 8 Mar 2019 04:12:52 +0000 (22:12 -0600)
commit62136d381a7ea5faa4e07f66c976876063e31d20
tree1e74bec7932e9ccb9f1024fe98fbfe8aafd3694a
parent4d33b6d56ab677082d92bf2c38aa7ea26b662ca6
parenta2debbc26bd136cab8ac7d461703c81c0b7daff7
Merge PR #26794 into master

* refs/pull/26794/head:
mon/MgrMonitor: only try to update always_on_modules if >= NAUTILUS
qa/standalone/mon/msgr-v2-transition: add some tests for enabling msgr v2
mon/MonmapMonitor: add 'ceph mon set-addrs <name> <addrvec>' command
Revert "mon/MonClient: disable ms_bind_msgr2 if NAUTILUS feature not set"
mon/OSDMonitor: use legacy_equals to compare osd addrs
msg/msg_types: make legacy_equals() symmetrical
mon/MDSMonitor: stop using get_orig_source_inst()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>