x
/
git-upstream
Code Issues Proposed changes

Merge "Consolidate some author email addresses"

This commit is contained in:
Jenkins 2017-06-26 11:04:13 +00:00 committed by Gerrit Code Review
parent c9e66d7de8 6c7d1b50b9
commit 3e1718f87c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -1,2 +1,3 @@
Darragh Bailey <daragh.bailey@gmail.com> <dbailey@hpe.com>
Darragh Bailey <daragh.bailey@gmail.com> <dbailey@hp.com>
Manuel Desbonnet <manuel.desbonnet@hpe.com> <manuel.desbonnet@hp.com>

2
AUTHORS
View File

@ -8,7 +8,7 @@ Jesse Keating <jlk@bluebox.net>
Jon-Paul Sullivan <jonpaul.sullivan@hp.com>
Jonathan Brownell <brownell@hp.com>
Jonathan Harker <code@gentlydownthe.net>
Manuel Desbonnet <manuel.desbonnet@hp.com>
Manuel Desbonnet <manuel.desbonnet@hpe.com>
Mathieu Gagné <mgagne@iweb.com>
Monty Taylor <mordred@inaugust.com>
Paul Bourke <paul.bourke@oracle.com>