]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01cdaf9 d308b54)
Merge PR #25316 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 12 Dec 2018 20:41:46 +0000 (12:41 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 12 Dec 2018 20:41:46 +0000 (12:41 -0800)
* refs/pull/25316/head:
client: don't update importing caps' mseq when handing cap export
mds: don't exclude disallowed caps when recording wanted caps

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

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