From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 17 Jan 2018 04:06:12 +0000 (-0800)
Subject: Merge PR #19911 into master
X-Git-Tag: v13.0.2~508
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4412c6b54177be435f416749dfb4eaf5abe70bc9;p=ceph.git

Merge PR #19911 into master

* refs/pull/19911/head:
	cephfs: Switch MIN/MAX for std::min/max and use intarith templates

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

4412c6b54177be435f416749dfb4eaf5abe70bc9