From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Fri, 19 Feb 2016 06:50:50 +0000 (+0100)
Subject: Merge pull request #2648 from keszybz/dnssec-work
X-Git-Tag: v231~610
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4d86881d5cea2d166149c80075f3ad8143c901f;p=platform%2Fupstream%2Fsystemd.git

Merge pull request #2648 from keszybz/dnssec-work

Better support for DANE, shell completion
---

e4d86881d5cea2d166149c80075f3ad8143c901f
diff --cc Makefile.am
index 5e3c12c,16a7a80..03341fc
--- a/Makefile.am
+++ b/Makefile.am
@@@ -5205,9 -5207,14 +5205,15 @@@ systemd_resolve_LDADD = 
  bin_PROGRAMS += \
  	systemd-resolve
  
+ dist_bashcompletion_data += \
+ 	shell-completion/bash/systemd-resolve
+ 
+ dist_zshcompletion_data += \
+ 	shell-completion/zsh/_systemd-resolve
+ 
  tests += \
 -	test-dns-domain \
 +	test-dns-packet \
 +	test-resolve-tables \
  	test-dnssec
  
  manual_tests += \