From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Aug 2018 17:25:23 +0000 (-0500)
Subject: Merge PR #23742 into master
X-Git-Tag: v14.0.1~461
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51e4eb779180ec88e5e588a1c25c552e780acce7;p=ceph.git

Merge PR #23742 into master

* refs/pull/23742/head:
	mon/OSDMonitor: don't change in-memory state on prune

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

51e4eb779180ec88e5e588a1c25c552e780acce7