From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 22 Sep 2017 16:53:35 +0000 (-0700)
Subject: Merge PR #17852 into luminous
X-Git-Tag: v12.2.1~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26beaa6667fbf95a371a2cf0d5130d8ff30327d9;p=ceph.git

Merge PR #17852 into luminous

* refs/remotes/upstream/pull/17852/head:
	mds: check ongoing catter-gather process before capping log

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

26beaa6667fbf95a371a2cf0d5130d8ff30327d9