]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #28702 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 13 Sep 2019 15:35:04 +0000 (08:35 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 13 Sep 2019 15:35:04 +0000 (08:35 -0700)
* refs/pull/28702/head:
qa: update json format from session listing
mds: recall caps from quiescent sessions
mds: use Session::dump method uniformly
mds: use auto to deduce iterator type
mds: simplify method definition
mds: remove useless debug message
mds: use const get_request_count
mds: use session_info_t socket inst for addr
mds: refactor session lookup
mds: add explicit trim flag
mds: alphabetize tracked config keys
common: provide method to get half-life
common: correct variable name

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
1  2 
src/common/options.cc
src/mds/Server.cc

Simple merge
Simple merge