]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #21592 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 29 Apr 2018 18:05:27 +0000 (11:05 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 29 Apr 2018 18:05:27 +0000 (11:05 -0700)
* refs/pull/21592/head:
mds: filter out blacklisted clients when importing caps
mds: don't add blacklisted clients to reconnect gather set
mds: combine MDCache::{cap_exports,cap_export_targets}

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDCache.cc
src/mds/MDCache.h
src/mds/Server.cc

Simple merge
Simple merge
Simple merge