diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 14:46:07 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 14:46:07 +0100 |
| commit | 74a71e798efd58e20cc150b04de2613bf518eed4 (patch) | |
| tree | 5b0b04e1b44912c6a143b180dead5b62e4390343 /tests/resultdata/imuxsock_ccmiddle.log | |
| parent | a8760241a30dc2618c53c569d23acdec1e06908e (diff) | |
| parent | 5b1cd3330196c5ffa2b8695798946aa2441b7e84 (diff) | |
| download | rsyslog-74a71e798efd58e20cc150b04de2613bf518eed4.tar.gz rsyslog-74a71e798efd58e20cc150b04de2613bf518eed4.tar.xz rsyslog-74a71e798efd58e20cc150b04de2613bf518eed4.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tests/resultdata/imuxsock_ccmiddle.log')
| -rw-r--r-- | tests/resultdata/imuxsock_ccmiddle.log | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/resultdata/imuxsock_ccmiddle.log b/tests/resultdata/imuxsock_ccmiddle.log new file mode 100644 index 00000000..d2531f9d --- /dev/null +++ b/tests/resultdata/imuxsock_ccmiddle.log @@ -0,0 +1 @@ + test 1#0112 |