diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-06 13:08:43 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-06 13:08:43 +0100 |
| commit | 081382b5630261902afb2b18fbaa1697ed220c4c (patch) | |
| tree | aceb768b22cf40b33db06caef9145917c743d1f5 /plugins/omelasticsearch/omelasticsearch.c | |
| parent | cb4848040ebbb83a8df49a18e686a324fa4879f8 (diff) | |
| parent | ec32919ca05598f11f538060c406d8668a35e229 (diff) | |
| download | rsyslog-081382b5630261902afb2b18fbaa1697ed220c4c.tar.gz rsyslog-081382b5630261902afb2b18fbaa1697ed220c4c.tar.bz2 rsyslog-081382b5630261902afb2b18fbaa1697ed220c4c.zip | |
Merge branch 'master-ruleeng' into master-ruleeng-simd
Conflicts:
doc/rsyslog_conf_actions.html
Diffstat (limited to 'plugins/omelasticsearch/omelasticsearch.c')
0 files changed, 0 insertions, 0 deletions