From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 18 Apr 2018 21:36:47 +0000 (-0700)
Subject: Merge PR #21456 into master
X-Git-Tag: v13.1.0~201
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=994cd16fbd1b41592a5017948df63cafc22afb5c;p=ceph-ci.git

Merge PR #21456 into master

* refs/pull/21456/head:
	MDSMonitor: initialize new Filesystem epoch from pending

Reviewed-by: John Spray <john.spray@redhat.com>
---

994cd16fbd1b41592a5017948df63cafc22afb5c