]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #38388 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 28 Jul 2021 17:30:31 +0000 (10:30 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 28 Jul 2021 17:30:31 +0000 (10:30 -0700)
* refs/pull/38388/head:
mds: check rejoin_ack_gather before enter rejoin_gather_finish

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

Simple merge