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/stdout/0001 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/stdout/0001')
| -rw-r--r-- | test/stdout/0001 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/stdout/0001 b/test/stdout/0001 index d9ce2f07b..9238c91fe 100644 --- a/test/stdout/0001 +++ b/test/stdout/0001 @@ -20,3 +20,4 @@ no_tcp_nodelay trusted_users = 1234:5678 unknown_login = unknownlogin warn_message_file = /home/exim/test/warnmsg_file +no_syslog_pid |