Fix post-rebase merge issues.

[users/jgh/exim.git] / test / log / 0461

diff --git a/test/log/0461 b/test/log/0461
index fbd0be47349a4f24cfb384ab7fbe77b138a79c8b..9d6f352ad6001f960e72960ec58d7cb377dfaf72 100644 (file)
--- a/test/log/0461
+++ b/test/log/0461
@@ -7,12 +7,11 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@test.ex R=r1 T=t1 defer (dd): Network Error
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** userx@test.ex: retry timeout exceeded
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** userx@test.ex R=r1 T=t1: retry time not reached for any host after a long failure period
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER <CALLER@test.ex> R=r0 T=t2
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed