]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 655507e 5655329)
Merge PR #43508 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 21 Oct 2021 02:27:40 +0000 (22:27 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 21 Oct 2021 02:27:40 +0000 (22:27 -0400)
* refs/pull/43508/head:
mds/FSMap: do not assert allow_standby_replay on old FSMaps

Reviewed-by: Ramana Raja <rraja@redhat.com>
1  2 
src/mds/FSMap.cc patch | diff1 | diff2 | blob | history
src/mon/MDSMonitor.cc patch | diff1 | diff2 | blob | history

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