From c85ea51dd09880fdfd5fbafdf1a8d3cc8cd9af90 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 3 Jun 2016 12:40:36 +0200
Subject: [PATCH] Fix double entry in authors

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0829581d7ea97d7d931527c872dbf9921757f497
Component: engine
---
 components/engine/.mailmap | 2 +-
 components/engine/AUTHORS  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/engine/.mailmap b/components/engine/.mailmap
index 5b0534475d..0527b6d84d 100644
--- a/components/engine/.mailmap
+++ b/components/engine/.mailmap
@@ -247,7 +247,7 @@ Hao Shu Wei <haosw@cn.ibm.com>
 <srbrahma@us.ibm.com> <sbrahma@us.ibm.com>
 <suda.akihiro@lab.ntt.co.jp> <suda.kyoto@gmail.com>
 <thomas@gazagnaire.org> <thomas@gazagnaire.com>
-<thomassong@tencent.com> <mymneo@163.com>
+Shengbo Song <thomassong@tencent.com> mYmNeo <mymneo@163.com>
 Shengbo Song <thomassong@tencent.com>
 <sylvain@ascribe.io> <sylvain.bellemare@ezeep.com>
 Sylvain Bellemare <sylvain@ascribe.io>
diff --git a/components/engine/AUTHORS b/components/engine/AUTHORS
index e70fd061cc..11cd83d14e 100644
--- a/components/engine/AUTHORS
+++ b/components/engine/AUTHORS
@@ -203,6 +203,7 @@ Campbell Allen <campbell.allen@gmail.com>
 Candid Dauth <cdauth@cdauth.eu>
 Carl Henrik Lunde <chlunde@ping.uio.no>
 Carl X. Su <bcbcarl@gmail.com>
+Carlos Alexandro Becker <caarlos0@gmail.com>
 Carlos Sanchez <carlos@apache.org>
 Carol Fager-Higgins <carol.fager-higgins@docker.com>
 Cary <caryhartline@users.noreply.github.com>
@@ -647,6 +648,7 @@ Jesse Dubay <jesse@thefortytwo.net>
 Jessica Frazelle <jess@mesosphere.com>
 Jezeniel Zapanta <jpzapanta22@gmail.com>
 jgeiger <jgeiger@gmail.com>
+Jhon Honce <jhonce@redhat.com>
 Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
 jianbosun <wonderflow.sun@gmail.com>
 Jilles Oldenbeuving <ojilles@gmail.com>
@@ -833,6 +835,7 @@ Lucas Chan <lucas-github@lucaschan.com>
 Luis Martínez de Bartolomé Izquierdo <lmartinez@biicode.com>
 Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 lukaspustina <lukas.pustina@centerdevice.com>
+Lukasz Zajaczkowski <Lukasz.Zajaczkowski@ts.fujitsu.com>
 lukemarsden <luke@digital-crocus.com>
 Lynda O'Leary <lyndaoleary29@gmail.com>
 Lénaïc Huard <lhuard@amadeus.com>
@@ -981,7 +984,6 @@ mschurenko <matt.schurenko@gmail.com>
 muge <stevezhang2014@gmail.com>
 Mustafa Akın <mustafa91@gmail.com>
 Muthukumar R <muthur@gmail.com>
-mYmNeo <thomassong@tencent.com>
 Máximo Cuadros <mcuadros@gmail.com>
 Médi-Rémi Hashim <medimatrix@users.noreply.github.com>
 Nahum Shalman <nshalman@omniti.com>
@@ -1146,6 +1148,7 @@ Rick Wieman <git@rickw.nl>
 Rik Nijessen <rik@keefo.nl>
 Riku Voipio <riku.voipio@linaro.org>
 Riley Guerin <rileytg.dev@gmail.com>
+Ritesh H Shukla <sritesh@vmware.com>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 Rob Vesse <rvesse@dotnetrdf.org>
 Robert Bachmann <rb@robertbachmann.at>
@@ -1236,6 +1239,7 @@ Sean P. Kane <skane@newrelic.com>
 Sebastiaan van Steenis <mail@superseb.nl>
 Sebastiaan van Stijn <github@gone.nl>
 Senthil Kumar Selvaraj <senthil.thecoder@gmail.com>
+Senthil Kumaran <senthil@uthcode.com>
 SeongJae Park <sj38.park@gmail.com>
 Seongyeol Lim <seongyeol37@gmail.com>
 Serge Hallyn <serge.hallyn@ubuntu.com>