From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Mar 2019 04:12:52 +0000 (-0600)
Subject: Merge PR #26794 into master
X-Git-Tag: v14.1.1~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62136d381a7ea5faa4e07f66c976876063e31d20;p=ceph.git

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>
---

62136d381a7ea5faa4e07f66c976876063e31d20