]> 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: 1551b54 ce22e48)
Merge PR #17652 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Sep 2017 21:12:23 +0000 (14:12 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Sep 2017 21:12:23 +0000 (14:12 -0700)
* refs/remotes/upstream/pull/17652/head:
client: use unsigned trim_caps count

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/client/Client.h patch | diff1 | diff2 | blob | history

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