]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22138 into mimic
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 24 May 2018 19:11:54 +0000 (12:11 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 24 May 2018 19:11:54 +0000 (12:11 -0700)
* refs/pull/22138/head:
mds: reply session reject for open request from blacklisted client
qa/tasks/cephfs: add timeout parameter to kclient umount_wait

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

Simple merge