diff --git a/.mailmap b/.mailmap index bd428bd559..e2a390bbea 100644 --- a/.mailmap +++ b/.mailmap @@ -110,3 +110,16 @@ Michal Suchanek Michal Suchanek Bastien Nocera Umut Tezduyar Lindskog +Alexander Kurtz +Piotr Szydełko +Łukasz Stelmach +Krzysztof Jackiewicz +Marcus Cooper +Insun Pyo +Ted Wood +Ted Wood +Anthony Parsons +Federico Di Pierro +Josef Andersson +Josef Andersson +Hendrik Westerberg diff --git a/NEWS b/NEWS index 70f1c64776..68f9e04fb1 100644 --- a/NEWS +++ b/NEWS @@ -96,34 +96,33 @@ CHANGES WITH 234: removed after the all plugins exit. So, if KERNEL_INSTALL_MACHINE_ID is empty, all plugins should not put anything in BOOT_DIR_ABS. - Contributions from: Adrian Heine né Lang, Aggelos Avgerinos, - AlexanderKurtz, Alexandros Frantzis, Alexey Brodkin, Amir Pakdel, - Amir Yalon, Anchor Cat, Bastien Nocera, Benjamin Gilbert, - Charles Plessy, Christian Brauner, Chris Chiu, Chris Lamb, - codekipper, Danielle Church, Daniel Drake, Daniel Molkentin, - Daniel Rusek, Daniel Wang, Davide Cavalca, David Herrmann, - David Michael, Dax Kelson, Dimitri John Ledkov, Djalal Harouni, - Dušan Kazik, Elias Probst, Evgeny Vereshchagin, Federico, - Felipe Sateler, Felix Zhang, flussence, Franck Bui, Gary Tierney, - George McCollister, hanklank, Hans de Goede, hecke, hendrikw01, - Hristo Venev, Ian Wienand, iplayinsun, Ivan Shapovalov, - James Cowgill, James Hemsing, Janne Heß, Jan Synacek, Jason Reeder, - João Paulo Rechi Vita, John Paul Adrian Glaubitz, Jörg Thalheim, - Josef Gajdusek, Julian Mehne, Kai Krakow, kjackiewicz, - Lars Karlitski, Lennart Poettering, Lluís Gili, Lucas Werkmeister, - Lukáš Nykrýn, Mantas Mikulėnas, Marcin Bachry, Mark Stosberg, - Martin Pitt, Matija Skala, Matthias Greiner, Matthijs van Duin, - Matt Clarkson, Max Resch, Michael Biebl, Michal Koutný, - Michal Sekletar, Michal Suchanek, Nate Clark, Nathaniel R. Lewis, - Neil Brown, Pascal S. de Kloe, Patrik Flykt, Pat Riehecky, - Paul Kocialkowski, Peter Hutterer, Philip Withnall, - Rafael Fontenelle, Ray Strode, Richard Maw, Roelf Wichertjes, - Ronny Chevalier, Sarang S. Dalal, Sjoerd Simons, slodki, steelman, - Stefan Schweter, Susant Sahani, Ted W, Thomas Blume, Thomas Haller, - Thomas H. P. Andersen, Timothée Ravier, Tobias Jungel, - Tobias Stoeckmann, Tom Gundersen, Tom Yan, Torstein Husebø, - Umut Tezduyar Lindskog, userwithuid, Waldemar Brodkorb, WaLyong Cho, - wiertel, Yusuke Nojima, Yu Watanabe, Zbigniew Jędrzejewski-Szmek, + Contributions from: Adrian Heine né Lang, Aggelos Avgerinos, Alexander + Kurtz, Alexandros Frantzis, Alexey Brodkin, Amir Pakdel, Amir Yalon, + Anchor Cat, Anthony Parsons, Bastien Nocera, Benjamin Gilbert, Charles + Plessy, Chris Chiu, Chris Lamb, Christian Brauner, Daniel Drake, + Danielle Church, Daniel Molkentin, Daniel Rusek, Daniel Wang, Davide + Cavalca, David Herrmann, David Michael, Dax Kelson, Dimitri John + Ledkov, Djalal Harouni, Dušan Kazik, Elias Probst, Evgeny Vereshchagin, + Federico Di Pierro, Felipe Sateler, Felix Zhang, Franck Bui, Gary + Tierney, George McCollister, Hans de Goede, hecke, Hendrik Westerberg, + Hristo Venev, Ian Wienand, Insun Pyo, Ivan Shapovalov, James Cowgill, + James Hemsing, Janne Heß, Jan Synacek, Jason Reeder, João Paulo Rechi + Vita, John Paul Adrian Glaubitz, Jörg Thalheim, Josef Andersson, Josef + Gajdusek, Julian Mehne, Kai Krakow, Krzysztof Jackiewicz, Lars + Karlitski, Lennart Poettering, Lluís Gili, Lucas Werkmeister, Lukáš + Nykrýn, Łukasz Stelmach, Mantas Mikulėnas, Marcin Bachry, Marcus + Cooper, Mark Stosberg, Martin Pitt, Matija Skala, Matt Clarkson, + Matthias Greiner, Matthijs van Duin, Max Resch, Michael Biebl, Michal + Koutný, Michal Sekletar, Michal Suchanek, Nate Clark, Nathaniel + R. Lewis, Neil Brown, Pascal S. de Kloe, Pat Riehecky, Patrik Flykt, + Paul Kocialkowski, Peter Hutterer, Philip Withnall, Piotr Szydełko, + Rafael Fontenelle, Ray Strode, Richard Maw, Roelf Wichertjes, Ronny + Chevalier, Sarang S. Dalal, Sjoerd Simons, slodki, Stefan Schweter, + Susant Sahani, Ted Wood, Thomas Blume, Thomas Haller, Thomas + H. P. Andersen, Timothée Ravier, Tobias Jungel, Tobias Stoeckmann, Tom + Gundersen, Tom Yan, Torstein Husebø, Umut Tezduyar Lindskog, + userwithuid, Waldemar Brodkorb, WaLyong Cho, Yusuke Nojima, Yu + Watanabe, Zbigniew Jędrzejewski-Szmek — Berlin, 2017-06-XX diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c index 9c3ee0136c..b3d37525f4 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/resolve/resolved-dns-server.c @@ -719,9 +719,9 @@ DnsServer *manager_set_dns_server(Manager *m, DnsServer *s) { return s; if (s) - log_info("Switching to %s DNS server %s.", - dns_server_type_to_string(s->type), - dns_server_string(s)); + log_debug("Switching to %s DNS server %s.", + dns_server_type_to_string(s->type), + dns_server_string(s)); dns_server_unref(m->current_dns_server); m->current_dns_server = dns_server_ref(s); diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index fc59a675e2..25b8c1152c 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -617,7 +617,7 @@ DnsServer* link_set_dns_server(Link *l, DnsServer *s) { return s; if (s) - log_info("Switching to DNS server %s for interface %s.", dns_server_string(s), l->name); + log_debug("Switching to DNS server %s for interface %s.", dns_server_string(s), l->name); dns_server_unref(l->current_dns_server); l->current_dns_server = dns_server_ref(s); diff --git a/tools/meson-git-contrib.sh b/tools/meson-git-contrib.sh index 1c614ef511..c543b3a5fa 100755 --- a/tools/meson-git-contrib.sh +++ b/tools/meson-git-contrib.sh @@ -4,4 +4,5 @@ git shortlog -s `git describe --abbrev=0`.. | \ cut -c8- | \ sed 's/ / /g' | \ awk '{ print $$0 "," }' | \ + sed -e 's/ / /g' | \ sort -u