From: Jos Collin <jcollin@redhat.com>
Date: Tue, 25 Jul 2017 05:32:14 +0000 (+0000)
Subject: Merge pull request #16038 from ztczll/ztczll
X-Git-Tag: v12.1.2~132
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77ecc5c6cf1642f020ac4b42b869df18fb476c38;p=ceph.git

Merge pull request #16038 from ztczll/ztczll

.mailmap, .organizationmap: Update ztczll affiliation

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
---

77ecc5c6cf1642f020ac4b42b869df18fb476c38