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/stderr/0479 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/stderr/0479') diff --git a/test/stderr/0479 b/test/stderr/0479 index a5e9f82cc..9386dce11 100644 --- a/test/stderr/0479 +++ b/test/stderr/0479 @@ -30,6 +30,8 @@ sender_rcvhost = [1.2.3.4] set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4] SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4] SMTP<< mail from: +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "rcpt" -- cgit v1.2.3