diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:31:56 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:31:56 +0200 |
commit | 706ddb492345e53d36084d0b843f237da865c6d4 (patch) | |
tree | 5c21c06e0f4c0ce15fa2d8413c149d687be43e72 /plugins/mmjsonparse/mmjsonparse.c | |
parent | a3a3a322d8c7d40dfed0765457d26a484a624bce (diff) | |
parent | 2014cf85627b8774e8c36ddecad04f1ebf43020b (diff) | |
download | rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.tar.gz rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.tar.bz2 rsyslog-706ddb492345e53d36084d0b843f237da865c6d4.zip |
Merge branch 'master' into master-ratelimit
Conflicts:
ChangeLog
doc/v7compatibility.html
Diffstat (limited to 'plugins/mmjsonparse/mmjsonparse.c')
-rw-r--r-- | plugins/mmjsonparse/mmjsonparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c index 68f5e74c..da5cfb51 100644 --- a/plugins/mmjsonparse/mmjsonparse.c +++ b/plugins/mmjsonparse/mmjsonparse.c @@ -138,7 +138,7 @@ finalize_it: RETiRet; } -#define COOKIE "@cee: " +#define COOKIE "@cee:" #define LEN_COOKIE (sizeof(COOKIE)-1) BEGINdoAction msg_t *pMsg; |