]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64c6079 5a7d4cb)
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)
* upstream/pull/15510/head:
  mds: improve freeze deadlock detection

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDCache.cc patch | diff1 | diff2 | blob | history
src/mds/Server.cc patch | diff1 | diff2 | blob | history

diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.