summaryrefslogtreecommitdiffstats
path: root/plugins/omelasticsearch/omelasticsearch.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-04-08 09:50:26 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-04-08 09:50:26 +0200
commit5acc47276816962b4d4ec58fdbbef1def08d7a3f (patch)
tree7b6a750fbf35282ac33c670530d634c42b6a5bab /plugins/omelasticsearch/omelasticsearch.c
parent755b56fdf4b542721b78b8badcb83f24f14c6495 (diff)
parent610137b49d5e4f8a0d448d8d361c042cf451a550 (diff)
downloadrsyslog-5acc47276816962b4d4ec58fdbbef1def08d7a3f.tar.gz
rsyslog-5acc47276816962b4d4ec58fdbbef1def08d7a3f.tar.bz2
rsyslog-5acc47276816962b4d4ec58fdbbef1def08d7a3f.zip
Merge branch 'c7'
Conflicts: ChangeLog
Diffstat (limited to 'plugins/omelasticsearch/omelasticsearch.c')
0 files changed, 0 insertions, 0 deletions