summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-07-25 15:03:46 +0200
committerLennart Poettering <lennart@poettering.net>2016-07-25 15:03:46 +0200
commitfec46f48b60f3258efb58d801d80a818109e2afc (patch)
tree0a1809d48e03ce70fc300c27dd1c5c0158c51063
parent43a569a18b7605f3e160054806d8b4da9f519f53 (diff)
NEWS: update mailmap to bring NEWS and "make git-contrib" in line
Let's make sure that "make git-contrib" prints a useful contributors list directly useful for NEWS and fixes up contributors's IDs a bit.
-rw-r--r--.mailmap4
-rw-r--r--NEWS12
2 files changed, 10 insertions, 6 deletions
diff --git a/.mailmap b/.mailmap
index c05b3b9540..d56fb67845 100644
--- a/.mailmap
+++ b/.mailmap
@@ -70,3 +70,7 @@ Otto Wallenius <otto_026@hotmail.com>
Tom Yan <tom.ty89@gmail.com>
Marty Plummer <ntzrmtthihu777@gmail.com>
Brian Boylston <brian.boylston@hpe.com>
+Thomas H. P. Andersen <phomes@gmail.com>
+Michael Olbrich <m.olbrich@pengutronix.de>
+Douglas Christman <DouglasChristman@gmail.com>
+Alexander Kuleshov <kuleshovmail@gmail.com> <0xAX@users.noreply.github.com>
diff --git a/NEWS b/NEWS
index 101cd77982..928ed52498 100644
--- a/NEWS
+++ b/NEWS
@@ -205,12 +205,12 @@ CHANGES WITH 231:
local changes made to systemd in a pristine, defined environment. See
HACKING for details.
- Contributions from: Alessandro Puccetti, Alessio Igor Bogani,
- Alexander Kuleshov, Alexander Kurtz, Alex Gaynor, Andika Triwidada,
- Andreas Pokorny, Andreas Rammhold, Andrew Jeddeloh, Ansgar Burchardt,
- Atrotors, Benjamin Drung, Brian Boylston, Christian Hesse, Christian
- Rebischke, Daniele Medri, Daniel Mack, Dave Reisner, David Herrmann,
- David Michael, Djalal Harouni, Doug Christman, Elias Probst, Evgeny
+ Contributions from: Alessandro Puccetti, Alessio Igor Bogani, Alexander
+ Kuleshov, Alexander Kurtz, Alex Gaynor, Andika Triwidada, Andreas
+ Pokorny, Andreas Rammhold, Andrew Jeddeloh, Ansgar Burchardt, Atrotors,
+ Benjamin Drung, Brian Boylston, Christian Hesse, Christian Rebischke,
+ Daniele Medri, Daniel Mack, Dave Reisner, David Herrmann, David
+ Michael, Djalal Harouni, Douglas Christman, Elias Probst, Evgeny
Vereshchagin, Federico Mena Quintero, Felipe Sateler, Franck Bui,
Harald Hoyer, Ian Lee, Ivan Shapovalov, Jakub Wilk, Jan Janssen,
Jean-Sébastien Bour, John Paul Adrian Glaubitz, Jouke Witteveen, Kai