]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22211 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 15 Jul 2018 22:03:13 +0000 (15:03 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 15 Jul 2018 22:03:13 +0000 (15:03 -0700)
* refs/pull/22211/head:
cephfs-journal-tool: get and check layout info during dump/undump

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/tools/cephfs/Dumper.cc

Simple merge