diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 11:49:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-05 11:49:32 +0100 |
| commit | c4f14fa28cc24cc56104b4b89ad380ee0f0470d3 (patch) | |
| tree | ae55c499426c23bf0a395e1f6dfe8b0a06822b90 /runtime/queue.c | |
| parent | a734fe1378c727cb779a0e5e84599aaf6277bbf9 (diff) | |
| parent | 9052857047f0cb67ef7b2fe1519120bf37ba2648 (diff) | |
| download | rsyslog-c4f14fa28cc24cc56104b4b89ad380ee0f0470d3.tar.gz rsyslog-c4f14fa28cc24cc56104b4b89ad380ee0f0470d3.tar.bz2 rsyslog-c4f14fa28cc24cc56104b4b89ad380ee0f0470d3.zip | |
Merge branch 'master-ruleeng' into master-ruleeng-simd
Conflicts:
runtime/ruleset.c
required refactoring of (asnyc) call code
Diffstat (limited to 'runtime/queue.c')
0 files changed, 0 insertions, 0 deletions