]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a8bd1c 2b06bff)
Merge PR #19860 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Jan 2018 04:06:26 +0000 (20:06 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Jan 2018 04:06:26 +0000 (20:06 -0800)
* refs/pull/19860/head:
cephfs-journal-tool: add usage help info for header set <field>
mds: add error log info
cephfs-journal-tool: add "set pool_id" option

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

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