From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Jul 2018 16:31:38 +0000 (-0500)
Subject: Merge PR #23233 into mimic
X-Git-Tag: v13.2.1~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfabdd06d595f41678a9fe2bcc46bae2bb6eaf53;p=ceph.git

Merge PR #23233 into mimic

* refs/pull/23233/head:
	mon: don't require CEPHX_V2 from mons until nautilus

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

dfabdd06d595f41678a9fe2bcc46bae2bb6eaf53