From: Sage Weil <sage@redhat.com>
Date: Wed, 20 Mar 2019 04:37:34 +0000 (-0500)
Subject: Merge PR #26672 into master
X-Git-Tag: v15.0.0~194
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a0abfe161933a2267e018143ba5d97bc87175bb;p=ceph.git

Merge PR #26672 into master

* refs/pull/26672/head:
	osd: correct a local variable type

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

6a0abfe161933a2267e018143ba5d97bc87175bb