]> 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: 72901b1 b6898d6)
Merge PR #31662 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 17 Dec 2019 00:06:30 +0000 (16:06 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 17 Dec 2019 00:06:30 +0000 (16:06 -0800)
* refs/pull/31662/head:
mds: fix revoking caps after after stale->resume circle
client: fix incorrect debug message

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

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