]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #60726 into main
authorVenky Shankar <vshankar@redhat.com>
Tue, 4 Mar 2025 12:52:34 +0000 (18:22 +0530)
committerVenky Shankar <vshankar@redhat.com>
Tue, 4 Mar 2025 12:52:34 +0000 (18:22 +0530)
* refs/pull/60726/head:
qa: add test checking 'journal import' from empty dump file
cephfs-journal-tool: fix segfault during 'journal import' from invalid dump file

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
1  2 
src/tools/cephfs/Dumper.cc

Simple merge