From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 9 May 2015 06:22:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'ahuremote/master'
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~28^2~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f15cdc4cd480e2c05b7713f4b301a6e2f6893f6;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'ahuremote/master'

Conflicts:
	pdns/dnsdistdist/populate
---

3f15cdc4cd480e2c05b7713f4b301a6e2f6893f6
diff --cc pdns/dnsdistdist/populate
index 21d098f4d6,19f881879a..12f9a1eb07
--- a/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@@ -3,14 -3,13 +3,15 @@@
  set -e
  set -x
  
 -ln -fs ../base32.hh ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc ../dns.hh \
 -../dnslabeltext.rl ../dnsname.cc ../dnsname.hh ../dnsparser.hh ../dnsrulactions.hh ../dnswriter.cc ../dnswriter.hh \
 -../dolog.hh ../iputils.cc ../iputils.hh ../misc.cc ../misc.hh ../namespaces.hh \
 -../pdnsexception.hh ../qtype.cc ../qtype.hh ../sholder.hh ../sodcrypto.cc ../sodcrypto.hh \
 -../dnsdist-web.cc ../sstuff.hh ../dnsdist-tcp.cc ../dnsdist-carbon.cc .
 +ln -fs ../base32.hh ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc \
 +  ../dns.hh ../dnslabeltext.rl ../dnsname.cc ../dnsname.hh ../dnsparser.hh \
 +  ../dnsrulactions.hh ../dnswriter.cc ../dnswriter.hh ../dolog.hh \
 +  ../iputils.cc ../iputils.hh ../misc.cc ../misc.hh ../namespaces.hh \
 +  ../pdnsexception.hh ../qtype.cc ../qtype.hh ../sholder.hh ../sodcrypto.cc \
-   ../sodcrypto.hh ../dnsdist-web.cc ../sstuff.hh ../dnsdist-tcp.cc .
++  ../sodcrypto.hh ../dnsdist-web.cc ../sstuff.hh ../dnsdist-tcp.cc \
++  ../dnsdist-carbon.cc .
  
 -mkdir m4
 +mkdir -p m4
  ln -fs ../../../m4/pdns_check_libsodium.m4 m4/
  ln -fs ../../../m4/pdns_check_readline.m4 m4/
  ln -fs ../../../m4/ax_lib_readline.m4 m4/