diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 16:35:43 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 16:35:43 +0100 |
| commit | eeb3212dad4d72eedad04a37b28b38fc831f67ed (patch) | |
| tree | 21664ffa0c5d788cc9d3ab535e953963bd410d63 /tests/testsuites/samples.parse-nodate | |
| parent | b8610a107ee4fd9e4b1ba06e7bd43dd6cbd72ea7 (diff) | |
| parent | 5709b056c5be16df1f1a2369a737e40711f20979 (diff) | |
| download | rsyslog-eeb3212dad4d72eedad04a37b28b38fc831f67ed.tar.gz rsyslog-eeb3212dad4d72eedad04a37b28b38fc831f67ed.tar.xz rsyslog-eeb3212dad4d72eedad04a37b28b38fc831f67ed.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tests/testsuites/samples.parse-nodate')
| -rw-r--r-- | tests/testsuites/samples.parse-nodate | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/testsuites/samples.parse-nodate b/tests/testsuites/samples.parse-nodate index 7f16181c..5432bcac 100644 --- a/tests/testsuites/samples.parse-nodate +++ b/tests/testsuites/samples.parse-nodate @@ -1,5 +1,5 @@ <27>xapi: [error|xen3|15|Guest liveness monitor D:bca30ab3f1c1|master_connection] Connection to master died. I will continue to retry indefinitely (supressing future logging of this message) -27,daemon,err,localhost,xapi,xapi:, [error|xen3|15|Guest liveness monitor D:bca30ab3f1c1|master_connection] Connection to master died. I will continue to retry indefinitely (supressing future logging of this message) +27,daemon,err,localhost.localdomain,xapi,xapi:, [error|xen3|15|Guest liveness monitor D:bca30ab3f1c1|master_connection] Connection to master died. I will continue to retry indefinitely (supressing future logging of this message) # a message with just text (as permitted by rfc 3164) # it is questionable if the current sample result is really correct as of 3164! This is a message! |