]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e50b12 e0eef2a)
Merge PR #22111 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 29 Jun 2018 17:28:40 +0000 (10:28 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 29 Jun 2018 17:28:40 +0000 (10:28 -0700)
* refs/pull/22111/head:
cephfs-journal-tool: check fsid when import purge queue

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/tools/cephfs/JournalTool.cc patch | diff1 | diff2 | blob | history

diff --cc src/tools/cephfs/JournalTool.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.