diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 09:41:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 09:41:40 +0200 |
| commit | 88154352094b2014bacaed2e5ee15c9b77ed19d5 (patch) | |
| tree | 7b604b598158fe446ec222a911a97df0a2487529 | |
| parent | c0e35e864aebef9de367f736e8b73a3f3753c7f9 (diff) | |
| parent | e99ca8246fee02bb7f713f31527f2377a5d2dd5c (diff) | |
| download | rsyslog-88154352094b2014bacaed2e5ee15c9b77ed19d5.tar.gz rsyslog-88154352094b2014bacaed2e5ee15c9b77ed19d5.tar.bz2 rsyslog-88154352094b2014bacaed2e5ee15c9b77ed19d5.zip | |
Merge branch 'v6-stable' into v6-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | plugins/cust1/cust1.c | 0 |
2 files changed, 2 insertions, 1 deletions
@@ -47,7 +47,7 @@ Version 6.5.0 [devel] 2012-08-28 Note: patches were released under ASL 2.0, see http://bugzilla.adiscon.com/show_bug.cgi?id=353 --------------------------------------------------------------------------- -Version 6.4.2 [V6-STABLE] 2012-09-?? +Version 6.4.2 [V6-STABLE] 2012-09-20 - bugfix: potential abort, if action queue could not be properly started This most importantly could happen due to configuration errors. - bugfix: remove invalid socket option call from imuxsock @@ -57,6 +57,7 @@ Version 6.4.2 [V6-STABLE] 2012-09-?? used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later. +- bugfix: config validation run did not always return correct return state --------------------------------------------------------------------------- Version 6.4.1 [V6-STABLE] 2012-09-06 - bugfix: multiple main queues with same queue file name were not detected diff --git a/plugins/cust1/cust1.c b/plugins/cust1/cust1.c new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/plugins/cust1/cust1.c |