From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 24 Apr 2018 04:27:55 +0000 (-0700)
Subject: Merge PR #21536 into master
X-Git-Tag: v13.1.0~138
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=613d3b72cfb2bed09c6df48401d679f07aef43a9;p=ceph-ci.git

Merge PR #21536 into master

* refs/pull/21536/head:
	qa: check old_max_mds is not wiped by marked down twice
	MDSMonitor: do not wipe old_max_mds when marked down twice

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
---

613d3b72cfb2bed09c6df48401d679f07aef43a9