]> 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: d269c85 48a9e69)
Merge PR #17340 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 7 Sep 2017 04:05:20 +0000 (21:05 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 7 Sep 2017 04:05:20 +0000 (21:05 -0700)
* refs/remotes/upstream/pull/17340/head:
mds: void sending cap import message when inode is frozen
client: fix message order check in handle_cap_export()

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.