From: Patrick Donnelly Date: Fri, 9 Feb 2018 02:17:15 +0000 (-0800) Subject: Merge PR #19954 into master X-Git-Tag: v13.0.2~309 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c95cc5144bbc5a34c46fdedbc23c256f627d996;p=ceph.git Merge PR #19954 into master * refs/pull/19954/head: test/encoding: refactor to avoid escaping shell magic mds: minor refactor of SimpleLock mds: track Capability in mempool mds: move CInode container members to mempool mds: move CDentry container members to mempool mds: move CDir container members to mempool mds: put MDSCacheObject compact_map in mempool common: use size_t for object size mds: convert to allocator agnostic string_view mds: simplify initialization compact_*: support mempool allocated containers Reviewed-by: Zheng Yan --- 8c95cc5144bbc5a34c46fdedbc23c256f627d996