summaryrefslogtreecommitdiffstats
path: root/plugins/omelasticsearch/omelasticsearch.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-19 11:43:51 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-19 11:43:51 +0100
commit86f233164f83fdccc54021dd4e81ef5a4a22c9e8 (patch)
treec67083359f75b6fb22d88298a8565a7963105c69 /plugins/omelasticsearch/omelasticsearch.c
parent75d2503bb71905f0c37d5228afa26b43bcb575f0 (diff)
parent496fad48bc87e2064fb9154d89c12bdf6eb67cbb (diff)
downloadrsyslog-86f233164f83fdccc54021dd4e81ef5a4a22c9e8.tar.gz
rsyslog-86f233164f83fdccc54021dd4e81ef5a4a22c9e8.tar.bz2
rsyslog-86f233164f83fdccc54021dd4e81ef5a4a22c9e8.zip
Merge branch 'v7-devel'
Conflicts: ChangeLog
Diffstat (limited to 'plugins/omelasticsearch/omelasticsearch.c')
0 files changed, 0 insertions, 0 deletions