]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: feaa3af 0705a83)
Merge PR #33005 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Feb 2020 00:38:34 +0000 (16:38 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Feb 2020 00:38:34 +0000 (16:38 -0800)
* refs/pull/33005/head:
mds: fix 'can wrlock' check in Locker::acquire_locks()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/Locker.cc patch | diff1 | diff2 | blob | history
src/mds/Locker.h patch | diff1 | diff2 | blob | history

diff --cc src/mds/Locker.cc
Simple merge
diff --cc src/mds/Locker.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.