aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap10
-rw-r--r--AUTHORS6
2 files changed, 9 insertions, 7 deletions
diff --git a/.mailmap b/.mailmap
index 06a3b84000..ccdca8dece 100644
--- a/.mailmap
+++ b/.mailmap
@@ -112,8 +112,9 @@ Matthieu Texier <matthieu@texier.tv> Matt Texier <matthieu@texier.tv>
Michael Oed <michael.oed@gmail.com> Mike78 <michael.oed@gmail.com>
Michael Tüxen <tuexen@wireshark.org> <tuexen@fh-muenster.de>
Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local>
-Michał Orynicz <michal.orynicz@tieto.com> michal.orynicz
+Michail Koreshkov <drkor@hotbox.ru> Michail Koreshkov <drkor@bk.ru>
Michał Łabędzki <michal.labedzki@wireshark.org> Michal Labedzki <michal.labedzki@tieto.com>
+Michał Orynicz <michal.orynicz@tieto.com> michal.orynicz
Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
Michal Prívozník <mprivozn@redhat.com> <mprivozn@redhat.com>
Mikael Kanstrup <mikael.kanstrup@gmail.com> Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
@@ -121,6 +122,7 @@ Mikhail Koreshkov <drkor@hotbox.ru> unknown <drkor@hotbox.ru>
Moraney Jalil <moraney.jalil@outlook.com> moraney.jalil
Moshe Kaplan <me@moshekaplan.com> moshekaplan <me@moshekaplan.com>
Moshe Kaplan <me@moshekaplan.com> Your Name <you@example.com>
+Nikhil Acharya Prakash <nikhilap@arista.com> Nikhil AP <nikhilap@arista.com>
Olga Kornievskaia <kolga@netapp.com> Olga Kornievskaia <olga.kornievskaia@gmail.com>
Oliver Downard <oliver.downard@couchbase.com> olivermd <oliver.downard@couchbase.com>
Øyvind Rønningstad <ronningstad@gmail.com> oyv <ronningstad@gmail.com>
@@ -146,6 +148,7 @@ Rudra Rugge <rrugge@juniper.net> Rudra Rugge <rudrarugge@gmail.com>
Rui ZHANG <rzhang@grandstream.cn> ZHANG Rui <rzhang@grandstream.cn>
Russel Howe <russel@appliedinvention.com> Russel <russel@appliedinvention.com>
Rustam Safargalin <rustam.safargalin@sifox.ru> Rustam S <rustam.safargalin@sifox.ru>
+Saku Ytti <saku@ytti.fi> ytti <saku@ytti.fi>
Samiran Saha <ssahasamiran@gmail.com> samsaha <ssahasamiran@gmail.com>
Sanket Godbole <sanket.godbole@spirent.com> sangodbole <sanket.godbole@spirent.com>
Selva Kumar <v.selvamuthukumar@gmail.com> Selva <v.selvamuthukumar@gmail.com>
@@ -175,6 +178,7 @@ Wido Kelling <kellingwido@aol.com> Widok <kellingwido@aol.com>
Yang Luo <hsluoyz@qq.com> hsluoyz <hsluoyz@qq.com>
Yang Luo <hsluoyz@qq.com> Yang Luo <hsluoyz@gmail.com>
Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com>
-Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>
-Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> <yatch@isl.rdc.toshiba.co.jp>
+Yasuyuki Tanaka <yasuyuki.tanaka@inria.fr> Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp>
+Yasuyuki Tanaka <yasuyuki.tanaka@inria.fr> Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp>
+Yasuyuki Tanaka <yasuyuki.tanaka@inria.fr> <yatch@isl.rdc.toshiba.co.jp>
Zhao Lin <zlbinghamton@gmail.com> linzhao115 <zlbinghamton@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index d4817c3948..9fa5a68ae8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4310,7 +4310,6 @@ Michael Oed <michael.oed[AT]gmail.com>
Michael Pergament <mpergament[AT]googlemail.com>
Michael Sweet <michael.r.sweet[AT]gmail.com>
Michael Vigovsky <upliner[AT]gmail.com>
-Michail Koreshkov <drkor[AT]bk.ru>
Michail Koreshkov <drkor[AT]hotbox.ru>
Michal Kubecek <mkubecek[AT]suse.cz>
Michal Pazdera <michal.pazdera[AT]gmail.com>
@@ -4338,7 +4337,7 @@ Nicolas BERTIN <nicolas.bertin[AT]al-enterprise.com>
Nicolas Cavallari <nicolas.cavallari[AT]green-communications.fr>
Nicolas Darchis <ndarchis[AT]cisco.com>
Nicolas S. Dade <nic.dade[AT]gmail.com>
-Nikhil AP <nikhilap[AT]arista.com>
+Nikhil Acharya Prakash <nikhilap[AT]arista.com>
Nikolai Ipatyev <wallprime[AT]yandex.com>
Nils Ohlmeier <github[AT]ohlmeier.org>
Nitzan Carmi <nitzanc[AT]mellanox.com>
@@ -4414,6 +4413,7 @@ Russell Lowes <russelll[AT]metamako.com>
Rustam Safargalin <rustam.safargalin[AT]sifox.ru>
Ryan Mullen <rmmullen[AT]gmail.com>
Rémy Léone <remy.leone[AT]gmail.com>
+Saku Ytti <saku[AT]ytti.fi>
Sam Cisneros <Sam.Cisneros15[AT]protonmail.com>
Samiran Saha <ssahasamiran[AT]gmail.com>
Sandeep Dahiya <sdahiya[AT]gmail.com>
@@ -4512,7 +4512,6 @@ Yang Luo <hsluoyz[AT]qq.com>
Yann Diorcet <yann[AT]diorcet.fr>
Yann Lejeune <ylejeune[AT]netyl.org>
Yasuyuki Tanaka <yasuyuki.tanaka[AT]inria.fr>
-Yasuyuki Tanaka <yatch1.tanaka[AT]toshiba.co.jp>
Yuri Chislov <yuri.chislov[AT]gmail.com>
Yurii Lysyi <yurii.lysyi[AT]ericsson.com>
Yury Gargay <yury.gargay[AT]gmail.com>
@@ -4524,7 +4523,6 @@ cheloftus <cheloftus[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
shqking <shqking[AT]gmail.com>
-ytti <saku[AT]ytti.fi>
Éric Piel <piel[AT]delmic.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>