From: Sage Weil <sage@redhat.com>
Date: Mon, 25 Feb 2019 16:44:43 +0000 (-0600)
Subject: Merge PR #26632 into master
X-Git-Tag: v14.1.1~147
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dddb858f5d5b4fe14a902d8e963beaed3fe2b381;p=ceph.git

Merge PR #26632 into master

* refs/pull/26632/head:
	14.1.0

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
---

dddb858f5d5b4fe14a902d8e963beaed3fe2b381