From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Mar 2019 23:26:12 +0000 (-0600)
Subject: Merge PR #26444 into master
X-Git-Tag: v14.1.1~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd52f35fd0a895bcfa996cd93c0d4d22aabaf4d7;p=ceph.git

Merge PR #26444 into master

* refs/pull/26444/head:
	ceph_features: deprecate MON_SINGLE_PAXOS
	osdmap: map versions to releases
	mon: retire some `osd set/unset` flags

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

bd52f35fd0a895bcfa996cd93c0d4d22aabaf4d7