SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6271 from poettering/resolved-switching

Browse Source 
downgrade DNS server switching log messages + NEWS fixes
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-07-03 12:52:25 -04:00
committed by GitHub
parent 1142bed25e 7c34a0a306
commit 60de7ab5d5
5 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.mailmap
+13
View File
@@ -110,3 +110,16 @@ Michal Suchanek <msuchanek@suse.de> <hramrach@gmail.com>
Michal Suchanek <msuchanek@suse.de>
Bastien Nocera <hadess@hadess.net> <hadess@users.noreply.github.com>
Umut Tezduyar Lindskog <umut@tezduyar.com>
Alexander Kurtz <alexander@kurtz.be>
Piotr Szydełko <wiertel@users.sourceforge.net>
Łukasz Stelmach <l.stelmach@samsung.com> <stlman@poczta.fm>
Krzysztof Jackiewicz <k.jackiewicz@samsung.com> <kjackiewicz@users.noreply.github.com>
Marcus Cooper <marcusc@axis.com> <codekipper@gmail.com>
Insun Pyo <insun.pyo@samsung.com> <iplayinsun@gmail.com>
Ted Wood <ted.l.wood@gmail.com>
Ted Wood <ted@mailchimp.com>
Anthony Parsons <flussence@users.noreply.github.com>
Federico Di Pierro <nierro92@gmail.com>
Josef Andersson <josef.andersson@fripost.org>
Josef Andersson <l10nl18nsweja@gmail.com>
Hendrik Westerberg <hendrik@gestorf.com>
NEWS
+27 -28
View File
@@ -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
src/resolve/resolved-dns-server.c
+3 -3
View File
@@ -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);
src/resolve/resolved-link.c
+1 -1
View File
@@ -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);
tools/meson-git-contrib.sh
+1
View File
@@ -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