diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-20 16:03:51 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-20 16:03:51 +0200 |
commit | 534e07d738fc5c7f5464ab94a010cc7113dfad2c (patch) | |
tree | 389432aabff3f72aee014452f7b449f41e829315 /ChangeLog | |
parent | 527edddb4646c24fa9a587601cd90d7a57a1fcf0 (diff) | |
parent | 74000ea71eb47c19653e0cd7bbffb83d913c3923 (diff) | |
download | rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.gz rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.xz rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.zip |
Merge branch 'v4-devel' into master
Conflicts:
plugins/imsolaris/imsolaris.c
tests/Makefile.am
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -408,6 +408,7 @@ Version 4.7.1 [v4-devel] (rgerhards), 2010-04-?? Solaris is no longer supported in imklog, but rather there is a new plugin imsolaris, which is used to pull local log sources on a Solaris machine. +- testbench improvement: Java is no longer needed for testing tool creation --------------------------------------------------------------------------- Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14 - new: support for Solaris added (but not yet the Solaris door API) |