]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/pull/15510/head' into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:48:47 +0000 (21:48 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:48:47 +0000 (21:48 -0700)
commitbbb0c6e3e1cbc6baa974a465cbc2cb5fd463c5aa
tree9b0c5ff5a3909384cfb02a1068c6d0b96851450b
parent64c6079d69baa193ce6d799d49f40976496dfaae
parent5a7d4cbc53935bc56c6d7b22816268d2e82246a2
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>
src/mds/MDCache.cc
src/mds/Server.cc