From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Fri, 25 Nov 2016 11:23:26 +0100 Subject: Merge from master into 4.next Done with git merge --squash -x theirs master --- test/rejectlog/0610 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/rejectlog/0610') diff --git a/test/rejectlog/0610 b/test/rejectlog/0610 index c1384b3de..1cff25686 100644 --- a/test/rejectlog/0610 +++ b/test/rejectlog/0610 @@ -1,4 +1,4 @@ ******** SERVER ******** 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL -1999-03-02 09:44:33 H=[127.0.0.2] temporarily rejected connection in "connect" ACL +1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] temporarily rejected connection in "connect" ACL -- cgit v1.2.3