diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-29 14:19:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-29 14:19:28 +0200 |
| commit | f9dc2f787630ec9729b02ef73dd8dc5614160f13 (patch) | |
| tree | 40e2d55ff76ee82bcbb57ffe6a95070de65ef3d1 /runtime/objomsr.c | |
| parent | 2a4e1c12f235d6914d650dd29d56df152b014209 (diff) | |
| parent | a5e51ced933cb73bd3755bffb81aceceb3f0f953 (diff) | |
| download | rsyslog-f9dc2f787630ec9729b02ef73dd8dc5614160f13.tar.gz rsyslog-f9dc2f787630ec9729b02ef73dd8dc5614160f13.tar.bz2 rsyslog-f9dc2f787630ec9729b02ef73dd8dc5614160f13.zip | |
Merge branch 'master' into v7-devel
Diffstat (limited to 'runtime/objomsr.c')
| -rw-r--r-- | runtime/objomsr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/objomsr.c b/runtime/objomsr.c index 7241fa27..9cf3781b 100644 --- a/runtime/objomsr.c +++ b/runtime/objomsr.c @@ -149,7 +149,8 @@ OMSRgetSupportedTplOpts(unsigned long *pOpts) { DEFiRet; assert(pOpts != NULL); - *pOpts = OMSR_RQD_TPL_OPT_SQL | OMSR_TPL_AS_ARRAY | OMSR_TPL_AS_MSG; + *pOpts = OMSR_RQD_TPL_OPT_SQL | OMSR_TPL_AS_ARRAY | OMSR_TPL_AS_MSG + | OMSR_TPL_AS_JSON; RETiRet; } |