summaryrefslogtreecommitdiffstats
path: root/plugins/omelasticsearch/omelasticsearch.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-06-10 17:47:10 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-06-10 17:47:10 +0200
commitdc4d262886742b2b4085a0be5f30c8a5299fc6f2 (patch)
treed44db6e86527cf30036d49f417f9933dce2f8a60 /plugins/omelasticsearch/omelasticsearch.c
parentbb3143655df3ee66cbba3a215502b880b57e69c3 (diff)
parent940327046c6302dc7955139adfc104e08d0179bd (diff)
downloadrsyslog-dc4d262886742b2b4085a0be5f30c8a5299fc6f2.tar.gz
rsyslog-dc4d262886742b2b4085a0be5f30c8a5299fc6f2.tar.bz2
rsyslog-dc4d262886742b2b4085a0be5f30c8a5299fc6f2.zip
Merge branch 'v7-stable'
Conflicts: ChangeLog
Diffstat (limited to 'plugins/omelasticsearch/omelasticsearch.c')
0 files changed, 0 insertions, 0 deletions