]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 241edfa bff2f47)
Merge pull request #5823 from SUSE/wip-11700-firefly
authorLoic Dachary <loic@dachary.org>
Fri, 23 Oct 2015 19:47:27 +0000 (21:47 +0200)
committerLoic Dachary <loic@dachary.org>
Fri, 23 Oct 2015 19:47:27 +0000 (21:47 +0200)
make the all osd/filestore thread pool suicide timeouts separately configurable

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

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