]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #28456 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 13 Jun 2019 19:22:05 +0000 (12:22 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 13 Jun 2019 19:22:05 +0000 (12:22 -0700)
* refs/pull/28456/head:
mds: ignore sessionmap version mismatch if mds_wipe_sessions is set
mds: fix corner case of replaying open sessions

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

Simple merge
Simple merge