summaryrefslogtreecommitdiffstats
path: root/plugins/omelasticsearch/omelasticsearch.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-19 10:45:53 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-19 10:45:53 +0100
commitcc9db052a7f5ac7e8c4d07f63f8c4545e1b01882 (patch)
tree84cbfa3454580f9e2d07818456a9b0e7ea2cf7d2 /plugins/omelasticsearch/omelasticsearch.c
parent88e6919d9db48c54b532698a8351c93356d11307 (diff)
parentde652e16a83e8e53f63b81caa0bcc0d7fbc04263 (diff)
downloadrsyslog-cc9db052a7f5ac7e8c4d07f63f8c4545e1b01882.tar.gz
rsyslog-cc9db052a7f5ac7e8c4d07f63f8c4545e1b01882.tar.bz2
rsyslog-cc9db052a7f5ac7e8c4d07f63f8c4545e1b01882.zip
Merge branch 'v7-stable' into v7-devel
Conflicts: ChangeLog plugins/imuxsock/imuxsock.c
Diffstat (limited to 'plugins/omelasticsearch/omelasticsearch.c')
0 files changed, 0 insertions, 0 deletions