diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-18 16:18:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-18 16:18:43 +0200 |
| commit | 1b01c2095245cf00e3aa6ba92d6653cc65d2b7e2 (patch) | |
| tree | 69af95cebb33eada96c966fa226ac7e6e7696a0c /plugins/omelasticsearch/omelasticsearch.c | |
| parent | e4d87aac957ea639935f56fb8b03f3c03d037491 (diff) | |
| parent | 68538a9013c59036d8825ef97a0a91552a9e7e99 (diff) | |
| download | rsyslog-1b01c2095245cf00e3aa6ba92d6653cc65d2b7e2.tar.gz rsyslog-1b01c2095245cf00e3aa6ba92d6653cc65d2b7e2.tar.bz2 rsyslog-1b01c2095245cf00e3aa6ba92d6653cc65d2b7e2.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
runtime/msg.c
Diffstat (limited to 'plugins/omelasticsearch/omelasticsearch.c')
0 files changed, 0 insertions, 0 deletions