summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-28 17:48:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-28 17:48:45 +0200
commitcdbeb9d75a9a79c1f5941f748af540ab13425cf1 (patch)
tree66c3e07e4c62e0ffc8fba8402e196823e92467d1 /ChangeLog
parente3a611ac6204e785d8f85ff54156dac5a722968f (diff)
parentcdd6328d1f2265f552e02502d75b6ed29846dd7b (diff)
downloadrsyslog-cdbeb9d75a9a79c1f5941f748af540ab13425cf1.tar.gz
rsyslog-cdbeb9d75a9a79c1f5941f748af540ab13425cf1.tar.xz
rsyslog-cdbeb9d75a9a79c1f5941f748af540ab13425cf1.zip
Merge branch 'master' into master-newruleset
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f2ee02c4..f13826b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
---------------------------------------------------------------------------
Version 7.1.7 [devel] 2012-09-??
-- implement RainerScript array-based string comparison operations
+- implemented RainerScript array-based string comparison operations
---------------------------------------------------------------------------
-Version 7.1.5 [devel] 2012-09-25
+Version 7.1.6 [devel] 2012-09-28
+- implemented RainerScript input() statement, including support for it
+ in major input plugins
- implemented RainerScript ruleset() statement
+---------------------------------------------------------------------------
+Version 7.1.5 [devel] 2012-09-25
- implemented RainerScript prifield() function
- implemented RainerScript field() function
- added new module imkmsg to process structured kernel log