diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:18:58 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:18:58 +0200 |
commit | aa0701b100084d61df6fff10be48bb088f551932 (patch) | |
tree | 24acb326dccf074331b9556e959df72ae6307bef /action.c | |
parent | 87472f58b4cd47762a7b134f0d8521cabc739cae (diff) | |
parent | 096db025e2c06045226f9f3c70386e3394d60bb2 (diff) | |
download | rsyslog-aa0701b100084d61df6fff10be48bb088f551932.tar.gz rsyslog-aa0701b100084d61df6fff10be48bb088f551932.tar.xz rsyslog-aa0701b100084d61df6fff10be48bb088f551932.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'action.c')
-rw-r--r-- | action.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1358,7 +1358,7 @@ doSubmitToActionQNotAllMarkBatch(action_t *pAction, batch_t *pBatch) time_t now = 0; time_t lastAct; int i; - int bProcessMarkMsgs; + int bProcessMarkMsgs = 0; int bModifiedFilter; sbool FilterSave[128]; sbool *pFilterSave; |