From: Jos Collin <jcollin@redhat.com>
Date: Fri, 26 Oct 2018 09:10:12 +0000 (+0530)
Subject: Merge pull request #24756 from tspmelo/wip-contribs
X-Git-Tag: v14.1.0~1085
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e15ebe80de55dfd76103f8ae97e8aee31d97f8f;p=ceph.git

Merge pull request #24756 from tspmelo/wip-contribs

.githubmap, .mailmap, .organizationmap: update contributors

Reviewed-by: Jos Collin <jcollin@redhat.com>
---

0e15ebe80de55dfd76103f8ae97e8aee31d97f8f