diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 11:41:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 11:41:23 +0200 |
| commit | 163acd9d9fd5e01975e99ad26af8a9c8097b3260 (patch) | |
| tree | d5901dfca0f2e38ddcf8b973086343ab23a866a1 /runtime/objomsr.c | |
| parent | bee73d2d93105b187171a1cc51ecf4125b39b65d (diff) | |
| parent | 82d0b37dc86385cd239b03da1e57eaba88720589 (diff) | |
| download | rsyslog-163acd9d9fd5e01975e99ad26af8a9c8097b3260.tar.gz rsyslog-163acd9d9fd5e01975e99ad26af8a9c8097b3260.tar.bz2 rsyslog-163acd9d9fd5e01975e99ad26af8a9c8097b3260.zip | |
Merge branch 'v6-beta' into v6-stable
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; } |