diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:42:54 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:42:54 +0200 |
| commit | bd8d972a975ce794dd71c1c8db724991dd4744a0 (patch) | |
| tree | 1dcf15151118890be2cc1506426c665bbc138933 | |
| parent | bfc6f6d599a4723b26708da5fddcc6db5c53fc21 (diff) | |
| parent | eef1701be28f8f8b00134e6c20a8a493d0e69f80 (diff) | |
| download | rsyslog-bd8d972a975ce794dd71c1c8db724991dd4744a0.tar.gz rsyslog-bd8d972a975ce794dd71c1c8db724991dd4744a0.tar.xz rsyslog-bd8d972a975ce794dd71c1c8db724991dd4744a0.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
configure.ac
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | doc/manual.html | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -7,7 +7,7 @@ $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens. --------------------------------------------------------------------------- -Version 5.8.10 [V5-stable] 2012-??-?? +Version 5.8.10 [V5-stable] 2012-04-05 - bugfix: segfault on startup if $actionqueuefilename was missing for disk queue config Thanks to Tomas Heinrich for the patch. diff --git a/doc/manual.html b/doc/manual.html index 690143de..29ac1ad5 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p> <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a> to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the project goals.</p> -<p><b>This documentation is for version 5.8.9 (v5-stable branch) of rsyslog.</b> +<p><b>This documentation is for version 5.8.10 (v5-stable branch) of rsyslog.</b> Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b> to obtain current version information and project status. </p><p><b>If you like rsyslog, you might |