diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-12 11:32:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-12 11:32:53 +0100 |
| commit | 07e296703b1f018a847496269432ea778d97b752 (patch) | |
| tree | cbfe47deb0f4fdaa75634ed9fa869a04ba9d6495 /plugins/omelasticsearch/omelasticsearch.c | |
| parent | 283ec2d6e8c4c037ee789759ddf6efecf570fff1 (diff) | |
| parent | bb74c4485a5fcb938645ca513f7b592aceff1c7f (diff) | |
| download | rsyslog-07e296703b1f018a847496269432ea778d97b752.tar.gz rsyslog-07e296703b1f018a847496269432ea778d97b752.tar.bz2 rsyslog-07e296703b1f018a847496269432ea778d97b752.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
action.c
queue.c (some code moved from action.c --> queue.c)
Diffstat (limited to 'plugins/omelasticsearch/omelasticsearch.c')
0 files changed, 0 insertions, 0 deletions