git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
SRS: fix mismerge
[exim.git] / test / log / 0614
diff --git a/test/log/0614 b/test/log/0614
index d7edb187294b55da5bc90f137fcf9d9be49c2927..4bfb0397f2f7553eb55004228c336a7032f4f1a5 100644 (file)
--- a/test/log/0614
+++ b/test/log/0614
@@ -4,7 +4,7 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= peter@dustybelt.tld U=CALLER P=local-smtp S=sss
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= ralph@dustyshoes.tld U=CALLER P=local-smtp S=sss
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= ralph@dustyshoes.tld U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qq
+1999-03-02 09:44:33 Start queue run: pid=p1234 -qq
 1999-03-02 09:44:33 10HmaX-0005vi-00 => bob@anotherone.tld F=<ralph@dustyshoes.tld> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbC-0005vi-00 => bob@anotherone.tld F=<ralph@dustyshoes.tld> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbE-0005vi-00"
@@ -17,10 +17,10 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 => bob@anotherone.tld F=<peter@dustybelt.tld> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbI-0005vi-00"
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qq
+1999-03-02 09:44:33 End queue run: pid=p1234 -qq
 
 ******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= ralph@dustyshoes.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name
 1999-03-02 09:44:33 10HmbE-0005vi-00 <= ralph@dustyshoes.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@the.local.host.name
 1999-03-02 09:44:33 10HmbF-0005vi-00 <= ralph@dustyshoes.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name
Master Exim source repository