]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit8a816946a45faf08d3924ef6a6c8a13604701698
tree5e6483973bdbf75e28146aea0905f12ac76781f4
parent1551b54f950d2162f4560f348f9274fd732b3455
parentce22e48cab4bc5ea4cc3259c530c91c50f7fd572
Merge PR #17652 into master

* 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>
src/client/Client.cc
src/client/Client.h