diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-28 10:19:29 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-28 10:19:29 +0100 |
| commit | e581c3d26ef7fc954bd271b348663a9e5e735ea5 (patch) | |
| tree | 3a1ef3a5affd9f99ebdbafa171c26f8a6d15f2bb /plugins/imdiag/imdiag.c | |
| parent | aaeb1945a7b7f8534edc04a03912c7942322fb83 (diff) | |
| parent | f161dfefd2455547847f0355b7a3a87063780a43 (diff) | |
| download | rsyslog-e581c3d26ef7fc954bd271b348663a9e5e735ea5.tar.gz rsyslog-e581c3d26ef7fc954bd271b348663a9e5e735ea5.tar.bz2 rsyslog-e581c3d26ef7fc954bd271b348663a9e5e735ea5.zip | |
Merge branch 'v7-stable'
Conflicts:
doc/imptcp.html
plugins/mmjsonparse/mmjsonparse.c
plugins/mmnormalize/mmnormalize.c
Diffstat (limited to 'plugins/imdiag/imdiag.c')
| -rw-r--r-- | plugins/imdiag/imdiag.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/imdiag/imdiag.c b/plugins/imdiag/imdiag.c index 15948215..5fdc6ef1 100644 --- a/plugins/imdiag/imdiag.c +++ b/plugins/imdiag/imdiag.c @@ -58,7 +58,6 @@ MODULE_TYPE_INPUT MODULE_TYPE_NOKEEP -MODULE_CNFNAME("imdiag") /* static data */ DEF_IMOD_STATIC_DATA |