summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2016-01-19 14:50:24 -0800
committerJohn Dickinson <me@not.mn>2016-01-20 09:35:14 -0800
commit221f94fdd39fd2dcd9a2e5565adceab615d55913 (patch)
tree7b044155ffd7e9f5665db89c7e8c395bb48ab162 /.mailmap
parentb9fd530657e885bd7c1796d1075803e690563b1d (diff)
downloadswift-221f94fdd39fd2dcd9a2e5565adceab615d55913.tar.gz
authors and changelog updates for 2.6.0
Change-Id: Idd0ff9e70abc0773be183c37cd6125fe852da7c0
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 6 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 00ee2a345..6827a2d4a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -87,3 +87,9 @@ Donagh McCabe <donagh.mccabe@hpe.com> <donagh.mccabe@hp.com>
Eamonn O'Toole <eamonn.otoole@hpe.com> <eamonn.otoole@hp.com>
Gerry Drudy <gerry.drudy@hpe.com> <gerry.drudy@hp.com>
Mark Seger <mark.seger@hpe.com> <mark.seger@hp.com>
+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>
+Peter Lisak <peter.lisak@firma.seznam.cz>
+Ke Liang <ke.liang@easystack.cn>