]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit5a56301945d910c0f2ca36107ec812f4823010b5
tree88097fc97ee20d3d34037d9e8d2121612857e69a
parente7856ffa04ce2485681d8a76c71f95b02cd1bd0a
parente43c02d6abd065dff413440a0f9c3d3f6653e87b
Merge PR #21592 into master

* 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>
src/mds/MDCache.cc
src/mds/MDCache.h
src/mds/Server.cc