diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
| commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
| tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/stderr/0378 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/stderr/0378')
| -rw-r--r-- | test/stderr/0378 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/stderr/0378 b/test/stderr/0378 index bb7b4a40a..d82f049a7 100644 --- a/test/stderr/0378 +++ b/test/stderr/0378 @@ -35,7 +35,7 @@ defer router skipped: local_parts mismatch --------> aaaa_2nd_time router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... aaaa_2nd_time router skipped: condition failure --------> aaaa router <-------- local_part=aaaa domain=myhost.test.ex @@ -212,7 +212,7 @@ defer router skipped: local_parts mismatch --------> aaaa_2nd_time router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... calling aaaa_2nd_time router rda_interpret (string): aaaa@$domain expanded: aaaa@myhost.test.ex |