diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-22 09:45:05 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-22 09:45:05 +0100 |
| commit | 84a5d7b138fd6366cf2964585f330e663b96d10e (patch) | |
| tree | 078ebcaf8b68e86c7ddf72f628a8aacf5a7cc770 /runtime/expr.h | |
| parent | ef9128a9f92f2a68ac0fb5db27ded192a258df13 (diff) | |
| parent | b78af2aaf546cee90671513be39d8e3717f2ace6 (diff) | |
| download | rsyslog-84a5d7b138fd6366cf2964585f330e663b96d10e.tar.gz rsyslog-84a5d7b138fd6366cf2964585f330e663b96d10e.tar.bz2 rsyslog-84a5d7b138fd6366cf2964585f330e663b96d10e.zip | |
Merge branch 'v5-stable' into v6-stable
Note: this was not a simple merge, I rather needed to adopt the v5 code to
the new v6 config handling. However, no v6 config format has been added yet
(this is the next step).
Conflicts:
plugins/imklog/imklog.c
plugins/imklog/imklog.h
Diffstat (limited to 'runtime/expr.h')
0 files changed, 0 insertions, 0 deletions