From e6678abba6232158c15bac2e23d6421aed4d6f5e Mon Sep 17 00:00:00 2001 From: Ralph Dolmans Date: Thu, 10 Nov 2016 11:20:27 +0000 Subject: [PATCH] - Fix #1155: test status code of unbound-control in 04-checkconf, not the status code from the tee command. git-svn-id: file:///svn/unbound/trunk@3926 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 4 ++++ testdata/04-checkconf.tpkg | Bin 5127 -> 5169 bytes 2 files changed, 4 insertions(+) diff --git a/doc/Changelog b/doc/Changelog index 949c5c4a6..d7053db1e 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +10 November 2016: Ralph + - Fix #1155: test status code of unbound-control in 04-checkconf, + not the status code from the tee command. + 4 November 2016: Ralph - Added stub-ssl-upstream and forward-ssl-upstream options. diff --git a/testdata/04-checkconf.tpkg b/testdata/04-checkconf.tpkg index f2ffe3535ff78f945ae5a39150321bfdaf320363..c100355de7ba571c74931dbb2e2ac8955ee98487 100644 GIT binary patch literal 5169 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