From: Sage Weil <sage@redhat.com>
Date: Fri, 25 May 2018 22:52:41 +0000 (-0500)
Subject: Merge PR #21934 into master
X-Git-Tag: v14.0.0^0
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=15edf77cc39e1a76b6e629ad710a5ad966d0dd34;p=ceph.git

Merge PR #21934 into master

* refs/pull/21934/head:
	qa/standalone/mon/misc: fix features test
	qa/workunits: osd require-osd-release mimic -> nautilus
	test/cli/monmaptool/feature-set-unset: fix unknown ids
	test/cli/monmaptool: fix test
	osd/OSDMap: make NAUTILUS feature bit significant
	mon: add initial NAUTILUS feature/compatset bits

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

15edf77cc39e1a76b6e629ad710a5ad966d0dd34