diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 10:24:58 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 10:24:58 +0100 |
| commit | 6c3ef4dacfa0a0fb0099299e30335c788704fe2a (patch) | |
| tree | cb43da8a6fd9508f872059d6dada70ed02348b10 /plugins/imfile | |
| parent | cd61ecd459d7ba915ac5b31743e7ded8db62e30e (diff) | |
| parent | fd26a42bdc04eaf497cafd9ef806a54f3de1a7e9 (diff) | |
| download | rsyslog-6c3ef4dacfa0a0fb0099299e30335c788704fe2a.tar.gz rsyslog-6c3ef4dacfa0a0fb0099299e30335c788704fe2a.tar.xz rsyslog-6c3ef4dacfa0a0fb0099299e30335c788704fe2a.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/omlibdbi/omlibdbi.c
tests/Makefile.am
tests/diag.sh
Diffstat (limited to 'plugins/imfile')
| -rw-r--r-- | plugins/imfile/imfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index bd44fd55..de71fb74 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -51,6 +51,7 @@ #include "ruleset.h" MODULE_TYPE_INPUT /* must be present for input modules, do not remove */ +MODULE_TYPE_NOKEEP /* defines */ |