]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #24991 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Dec 2018 18:54:46 +0000 (10:54 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Dec 2018 18:54:46 +0000 (10:54 -0800)
* refs/pull/24991/head:
mds: disallow dumping huge caches to formatter

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/common/options.cc
src/mds/MDCache.cc
src/mds/MDSDaemon.cc

Simple merge
Simple merge
Simple merge