From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Jul 2018 13:47:17 +0000 (-0500)
Subject: Merge PR #23250 into mimic
X-Git-Tag: v13.2.1~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f95b5f6051ef406909067d39ea10254044fe4b9e;p=ceph.git

Merge PR #23250 into mimic

* refs/pull/23250/head:
	osd/OSDMap: fix CEPHX_V2 osd requirement to nautilus, not mimic

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

f95b5f6051ef406909067d39ea10254044fe4b9e