Merge pull request #3807 from rgacogne/auth-caches-ttl-settings

author Peter van Dijk <peter.van.dijk@powerdns.com>

Wed, 4 May 2016 08:04:07 +0000 (10:04 +0200)

committer Peter van Dijk <peter.van.dijk@powerdns.com>

Wed, 4 May 2016 08:04:07 +0000 (10:04 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Wed, 4 May 2016 08:04:07 +0000 (10:04 +0200)
committer Peter van Dijk <peter.van.dijk@powerdns.com>
Wed, 4 May 2016 08:04:07 +0000 (10:04 +0200)
diff --cc pdns/common_startup.cc
Simple merge
diff --cc pdns/dbdnsseckeeper.cc
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Wed, 4 May 2016 08:04:07 +0000 (10:04 +0200)
committer	Peter van Dijk <peter.van.dijk@powerdns.com>
	Wed, 4 May 2016 08:04:07 +0000 (10:04 +0200)
		1	2
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dbdnsseckeeper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history