]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #21966 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 14 May 2018 20:28:49 +0000 (13:28 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 14 May 2018 20:29:29 +0000 (13:29 -0700)
* refs/pull/21966/head:
mds: handle imported session race
mds: check for session import race

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>

Trivial merge