]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #2959 from keszybz/stop-resolving-localdomain
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 5 Apr 2016 02:06:37 +0000 (22:06 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 5 Apr 2016 02:06:37 +0000 (22:06 -0400)
*.localdomain != localhost

1  2 
man/nss-myhostname.xml
src/basic/hostname-util.c

Simple merge
Simple merge