]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commite335808d267435414dc1351e0f2e99e773fce805
tree9be449dbb716b564ad23ac93262a5d0c7b7c735ftree | snapshot
parent47e3ff8408af027fe60f1260c3c46c7ac7f8135bcommit | diff
parent244a2ae6a91e2f288cf1ef8c930dec712b588e37commit | diff
Merge PR #16248 into jewel

* 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>
Unnamed repository; edit this file 'description' to name the repository.