From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Jul 2017 04:48:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/pull/15510/head' into master
X-Git-Tag: v12.1.1~148
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbb0c6e3e1cbc6baa974a465cbc2cb5fd463c5aa;p=ceph.git

Merge remote-tracking branch 'upstream/pull/15510/head' into master

* upstream/pull/15510/head:
  mds: improve freeze deadlock detection

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

bbb0c6e3e1cbc6baa974a465cbc2cb5fd463c5aa