]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #22289 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Jun 2018 14:01:57 +0000 (07:01 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Jun 2018 14:01:57 +0000 (07:01 -0700)
commitc7951d8f3660d6becded39e6b9fdabf212355e0d
tree837d0fc9bbd35490a9230e44c56ada97ab58ed52
parent88bf596a354447041914ef2b2bb5e2b645d6b367
parent091658a331d35a14f9c77ac107bbd94af2511a15
Merge PR #22289 into master

* refs/pull/22289/head:
mds: put Capability in map container

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/Locker.cc
src/mds/MDCache.cc
src/mds/Migrator.cc