]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #41358 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 20 May 2021 19:43:53 +0000 (12:43 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 20 May 2021 19:43:53 +0000 (12:43 -0700)
* refs/pull/41358/head:
mds: add heartbeat_reset() in start_files_to_reover() to avoid timedout issue

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDCache.cc

Simple merge