Merge pull request #3090 from dmcgowan/update-mailmap

dmcgowan · web-flow · commit 09da2d867aff · 2019-03-12T11:38:21.000-07:00
Update mailmap for cgroup authors
diff --git a/.mailmap b/.mailmap
@@ -2,7 +2,9 @@ Abhinandan Prativadi <abhi@docker.com> Abhinandan Prativadi <aprativadi@gmail.co
 Abhinandan Prativadi <abhi@docker.com> abhi <abhi@docker.com>
 Akihiro Suda <suda.akihiro@lab.ntt.co.jp> Akihiro Suda <suda.kyoto@gmail.com>
 Andrei Vagin <avagin@virtuozzo.com> Andrei Vagin <avagin@openvz.org>
+Brent Baude <bbaude@redhat.com> baude <bbaude@redhat.com>
 Frank Yang <yyb196@gmail.com> frank yang <yyb196@gmail.com>
+Georgia Panoutsakopoulou <gpanoutsak@gmail.com> gpanouts <gpanoutsak@gmail.com>
 Jie Zhang <iamkadisi@163.com> kadisi <iamkadisi@163.com>
 John Howard <john.howard@microsoft.com> John Howard <jhoward@microsoft.com>
 Justin Terry <juterry@microsoft.com> Justin Terry (VM) <juterry@microsoft.com>

-Original file line number
+Diff line change
 Abhinandan Prativadi <[email protected]> abhi <[email protected]>
 Akihiro Suda <[email protected]> Akihiro Suda <[email protected]>
 Andrei Vagin <[email protected]> Andrei Vagin <[email protected]>
 +Brent Baude <[email protected]> baude <[email protected]>
 Frank Yang <[email protected]> frank yang <[email protected]>
 +Georgia Panoutsakopoulou <[email protected]> gpanouts <[email protected]>
 Jie Zhang <[email protected]> kadisi <[email protected]>
 John Howard <[email protected]> John Howard <[email protected]>
 Justin Terry <[email protected]> Justin Terry (VM) <[email protected]>