]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47e3ff8 244a2ae)
Merge PR #16248 into jewel
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 25 Aug 2017 21:26:21 +0000 (14:26 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 25 Aug 2017 21:26:21 +0000 (14:26 -0700)
* refs/remotes/upstream/pull/16248/head:
client: don't re-send interrupted flock request
mds/flock: properly remove item from global_waiting_locks
mds/flock: properly update ceph_lock_state_t::client_waiting_lock_counts
mds/flock: don't import ceph_lock_state_t::waiting_locks

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.