From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 25 Sep 2018 14:16:20 +0000 (-0700)
Subject: Merge PR #24232 into master
X-Git-Tag: v14.0.1~188
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e028f3322fb997bf0a0407b6d4938c6b7406a90;p=ceph.git

Merge PR #24232 into master

* refs/pull/24232/head:
	githubmap: update contributors

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

6e028f3322fb997bf0a0407b6d4938c6b7406a90