summaryrefslogtreecommitdiffstats
path: root/tests/failover-async.sh
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-05-10 08:23:12 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-05-10 08:23:12 +0200
commit24a81f99508821b608c1dc9e3fee6c2ebbaed59d (patch)
treee69dcb9f836bb1f6a4489f428fb6a54f051781bf /tests/failover-async.sh
parentfdcaca6b85d65ef2c9b4814cc4a9adda4568e24f (diff)
parentd86a212255d9fd1ef3e4b0e99db1f4bfd0625260 (diff)
downloadrsyslog-24a81f99508821b608c1dc9e3fee6c2ebbaed59d.tar.gz
rsyslog-24a81f99508821b608c1dc9e3fee6c2ebbaed59d.tar.xz
rsyslog-24a81f99508821b608c1dc9e3fee6c2ebbaed59d.zip
Merge branch 'v5-stable' into v5-beta
Conflicts: ChangeLog
Diffstat (limited to 'tests/failover-async.sh')
0 files changed, 0 insertions, 0 deletions