From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 21 Feb 2019 18:43:27 +0000 (-0800)
Subject: Merge PR #26458 into master
X-Git-Tag: v14.1.0~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ed26228352cae024d34d81875c2cc7918d81075;p=ceph.git

Merge PR #26458 into master

* refs/pull/26458/head:
	MDSMonitor: do not assign standby-replay when degraded

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

1ed26228352cae024d34d81875c2cc7918d81075