From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 6 Dec 2017 06:35:52 +0000 (-0800)
Subject: Merge PR #18941 into master
X-Git-Tag: v13.0.2~859
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=380324a502c00aa739ef3d83c478826b33d6719a;p=ceph.git

Merge PR #18941 into master

* refs/pull/18941/head:
	discard the mdsload clear after prep_rebalance in case we want to export it for debugging
	make sure that MDBalancer uses heartbeat info from the same epoch

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

380324a502c00aa739ef3d83c478826b33d6719a