summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2017-02-23 02:17:51 +0100
committerSebastiaan van Stijn <github@gone.nl>2017-02-23 02:17:51 +0100
commit5dfac5499a147b66e81f091714c2c9df3107ec62 (patch)
tree72032cb83c4ce5b089c180502d0d014664468f6e /.mailmap
parent19cd2aa389dff922589fe83fc2c48f0477a36617 (diff)
downloaddocker-5dfac5499a147b66e81f091714c2c9df3107ec62.tar.gz
Update authors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap45
1 files changed, 45 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index fe99e2086f..014cc0e93e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -142,6 +142,7 @@ Jessica Frazelle <jessfraz@google.com> <me@jessfraz.com>
Jessica Frazelle <jessfraz@google.com> <jess@mesosphere.com>
Jessica Frazelle <jessfraz@google.com> <jfrazelle@users.noreply.github.com>
Jessica Frazelle <jessfraz@google.com> <acidburn@docker.com>
+Jessica Frazelle <jessfraz@google.com> <acidburn@google.com>
Jessica Frazelle <jessfraz@google.com> <jess@docker.com>
Jessica Frazelle <jessfraz@google.com> <princess@docker.com>
<konrad.wilhelm.kleine@gmail.com> <kwk@users.noreply.github.com>
@@ -273,3 +274,47 @@ Tom Barlow <tomwbarlow@gmail.com>
Xianlu Bird <xianlubird@gmail.com>
Dan Feldman <danf@jfrog.com>
Harry Zhang <harryz@hyper.sh> <harryzhang@zju.edu.cn>
+Alex Chen <alexchenunix@gmail.com> alexchen <root@localhost.localdomain>
+Alex Ellis <alexellis2@gmail.com>
+Alicia Lauerman <alicia@eta.im> <allydevour@me.com>
+Ben Bonnefoy <frenchben@docker.com>
+Bhumika Bayani <bhumikabayani@gmail.com>
+Bingshen Wang <bingshen.wbs@alibaba-inc.com>
+Chen Chuanliang <chen.chuanliang@zte.com.cn>
+Chen Mingjie <chenmingjie0828@163.com>
+CUI Wei <ghostplant@qq.com> cuiwei13 <cuiwei13@pku.edu.cn>
+Dattatraya Kumbhar <dattatraya.kumbhar@gslab.com>
+Diego Siqueira <dieg0@live.com>
+Evelyn Xu <evelynhsu21@gmail.com>
+Felix Ruess <felix.ruess@gmail.com> <felix.ruess@roboception.de>
+Gabriel Nicolas Avellaneda <avellaneda.gabriel@gmail.com>
+Gang Qiao <qiaohai8866@gmail.com> <1373319223@qq.com>
+Helen Xie <chenjg@harmonycloud.cn>
+Jacob Tomlinson <jacob@tom.linson.uk> <jacobtomlinson@users.noreply.github.com>
+Jiuyue Ma <majiuyue@huawei.com>
+Jose Diaz-Gonzalez <jose@seatgeek.com> <josegonzalez@users.noreply.github.com>
+Josh Eveleth <joshe@opendns.com> <jeveleth@users.noreply.github.com>
+Josh Wilson <josh.wilson@fivestars.com> <jcwilson@users.noreply.github.com>
+Kevin Kern <kaiwentan@harmonycloud.cn>
+Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp> <kunal.kushwaha@gmail.com>
+Lajos Papp <lajos.papp@sequenceiq.com> <lalyos@yahoo.com>
+Lyn <energylyn@zju.edu.cn>
+Michael Käufl <docker@c.michael-kaeufl.de> <michael-k@users.noreply.github.com>
+Michal Minář <miminar@redhat.com>
+Michael Hudson-Doyle <michael.hudson@canonical.com> <michael.hudson@linaro.org>
+Milind Chawre <milindchawre@gmail.com>
+Ma Müller <mueller-ma@users.noreply.github.com>
+Roberto Muñoz Fernández <robertomf@gmail.com> <roberto.munoz.fernandez.contractor@bbva.com>
+Stefan S. <tronicum@user.github.com>
+Sun Gengze <690388648@qq.com>
+Tim Zju <21651152@zju.edu.cn>
+Tõnis Tiigi <tonistiigi@gmail.com>
+Wang Ping <present.wp@icloud.com>
+Wang Yuexiao <wang.yuexiao@zte.com.cn>
+Wewang Xiaorenfine <wang.xiaoren@zte.com.cn>
+Wei Wu <wuwei4455@gmail.com> cizixs <cizixs@163.com>
+Ying Li <ying.li@docker.com> <cyli@twistedmatrix.com>
+Yu Peng <yu.peng36@zte.com.cn>
+Yu Peng <yu.peng36@zte.com.cn> <yupeng36@zte.com.cn>
+Zhenkun Bi <bi.zhenkun@zte.com.cn>
+Zhu Kunjia <zhu.kunjia@zte.com.cn>