diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:17:11 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:17:11 +0200 |
| commit | d788daafa4e8bda5fe544718b5f420f22cd79996 (patch) | |
| tree | cc87c4680a6462f3b5c1a2c19cc92369c31b7e7d | |
| parent | 407a1b85d4917b5593d698ab5601aa7bc11da162 (diff) | |
| parent | a3953fbee90045b96bd5ef44b64883a6bff57fee (diff) | |
| download | rsyslog-d788daafa4e8bda5fe544718b5f420f22cd79996.tar.gz rsyslog-d788daafa4e8bda5fe544718b5f420f22cd79996.tar.xz rsyslog-d788daafa4e8bda5fe544718b5f420f22cd79996.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -855,6 +855,9 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14 Thanks for varmojfekoj for pointing me at this bug. - imported changes from 4.5.6 and below --------------------------------------------------------------------------- +Version 4.6.8 [v4-stable] (rgerhards), 2011-??-?? +- bugfix: potential misadressing in property replacer +--------------------------------------------------------------------------- Version 4.6.7 [v4-stable] (rgerhards), 2011-07-11 - added support for the ":omusrmsg:" syntax in configuring user messages - added support for the ":omfile:" syntax in configuring user messages @@ -1560,6 +1563,7 @@ Version 3.22.4 [v3-stable] (rgerhards), 2010-??-?? offset closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271 - improved some code based on clang static analyzer results +- bugfix: potential misadressing in property replacer --------------------------------------------------------------------------- Version 3.22.3 [v3-stable] (rgerhards), 2010-11-24 - bugfix(important): problem in TLS handling could cause rsyslog to loop |