]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #19954 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 9 Feb 2018 02:17:15 +0000 (18:17 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 9 Feb 2018 02:17:15 +0000 (18:17 -0800)
* 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 <zyan@redhat.com>
12 files changed:
1  2 
src/client/Client.cc
src/mds/CDentry.cc
src/mds/CInode.cc
src/mds/Locker.cc
src/mds/MDSDaemon.cc
src/mds/MDSRank.cc
src/mds/MDSRank.h
src/mds/RecoveryQueue.cc
src/mds/Server.cc
src/mds/Server.h
src/mds/journal.cc
src/test/encoding/types.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge