summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2017-07-20 15:43:51 -0700
committerJohn Dickinson <me@not.mn>2017-07-27 14:44:21 -0700
commitdfd0ea20a156895bb91582fb861ebd430afc0054 (patch)
tree6fc5daca209d7c970e147a8b85bdc187218e1a94 /.mailmap
parent4b1acd80508327b870b64964c4f2991800154784 (diff)
downloadswift-dfd0ea20a156895bb91582fb861ebd430afc0054.tar.gz
2.15.0 authors and changelog update
Change-Id: I8ee9d657ebc030b9335cb53a51951c118539cb91
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 48d71b7db..6e0c02d52 100644
--- a/.mailmap
+++ b/.mailmap
@@ -94,6 +94,7 @@ Timur Alperovich <timur.alperovich@gmail.com> <timuralp@swiftstack.com>
Mehdi Abaakouk <sileht@redhat.com> <mehdi.abaakouk@enovance.com>
Richard Hawkins <richard.hawkins@rackspace.com> <hurricanerix@gmail.com>
Ondrej Novy <ondrej.novy@firma.seznam.cz>
+Ondrej Novy <ondrej.novy@firma.seznam.cz> <novy@ondrej.org>
Peter Lisak <peter.lisak@firma.seznam.cz>
Ke Liang <ke.liang@easystack.cn>
Daisuke Morita <morita.daisuke@ntti3.com> <morita.daisuke@lab.ntt.co.jp>
@@ -119,3 +120,4 @@ Flavio Percoco <flaper87@gmail.com>
Tin Lam <tinlam@gmail.com> <tl3438@att.com>
Hisashi Osanai <osanai.hisashi@gmail.com> <osanai.hisashi@jp.fujitsu.com>
Bryan Keller <kellerbr@us.ibm.com>
+Doug Hellmann <doug@doughellmann.com> <doug.hellmann@dreamhost.com>