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/omtesting/omtesting.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/omtesting/omtesting.c')
| -rw-r--r-- | plugins/omtesting/omtesting.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/omtesting/omtesting.c b/plugins/omtesting/omtesting.c index ff290c94..c9f1e06b 100644 --- a/plugins/omtesting/omtesting.c +++ b/plugins/omtesting/omtesting.c @@ -313,6 +313,7 @@ ENDmodExit BEGINqueryEtryPt CODESTARTqueryEtryPt CODEqueryEtryPt_STD_OMOD_QUERIES +CODEqueryEtryPt_STD_CONF2_CNFNAME_QUERIES ENDqueryEtryPt |