diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-08 18:45:22 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-08 18:45:22 +0100 |
| commit | d50f1e711ffd479d1ddbc89342e9b28b8b9abba9 (patch) | |
| tree | 8364adc48f18f3fafb66990a0ed6a55e66a16da5 /tests/discard-rptdmsg-vg.sh | |
| parent | f813c01258ec5ef3adc8f4790c5c743c2f4b462a (diff) | |
| parent | 3866bd51bf7e622594ff4831664c28d80f711cb3 (diff) | |
| download | rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.tar.gz rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.tar.xz rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
tests/Makefile.am
tools/syslogd.c
Diffstat (limited to 'tests/discard-rptdmsg-vg.sh')
0 files changed, 0 insertions, 0 deletions