summaryrefslogtreecommitdiffstats
path: root/plugins/omelasticsearch
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-03-29 16:09:19 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-03-29 16:09:19 +0100
commit7b45d0b4d2caa27df4835ca59617bd869ee34442 (patch)
treed30fbc00ca571f050c60eeede91a62fab8684136 /plugins/omelasticsearch
parent1b2f93da31d0331244aa7c72068f4ec324e2cb71 (diff)
parent474877b9d7912a3d2abc2a350dbc41e4c3b050e4 (diff)
downloadrsyslog-7b45d0b4d2caa27df4835ca59617bd869ee34442.tar.gz
rsyslog-7b45d0b4d2caa27df4835ca59617bd869ee34442.tar.bz2
rsyslog-7b45d0b4d2caa27df4835ca59617bd869ee34442.zip
Merge branch 'v7-stable-info'
Conflicts: ChangeLog template.c
Diffstat (limited to 'plugins/omelasticsearch')
0 files changed, 0 insertions, 0 deletions