]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29b850c 7de3738)
Merge PR #18624 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 3 Nov 2017 21:35:52 +0000 (14:35 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 3 Nov 2017 21:35:52 +0000 (14:35 -0700)
* refs/pull/18624/head:
mds: trim 'N' log segments according to how many log segments are there

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/common/legacy_config_opts.h patch | diff1 | diff2 | blob | history
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.