]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #19911 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Jan 2018 04:06:12 +0000 (20:06 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Jan 2018 04:06:12 +0000 (20:06 -0800)
* refs/pull/19911/head:
cephfs: Switch MIN/MAX for std::min/max and use intarith templates

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge