summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-19 12:20:09 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-19 12:20:09 +0100
commitf521594d5979be7819df617df15d4074999fc860 (patch)
tree4f5ec2030c3a16a79a768c554ed2ac113d18f3e5
parent496fad48bc87e2064fb9154d89c12bdf6eb67cbb (diff)
parent0140beeb03d1fdef15c15dd25dfacd7c3e6d09e6 (diff)
downloadrsyslog-f521594d5979be7819df617df15d4074999fc860.tar.gz
rsyslog-f521594d5979be7819df617df15d4074999fc860.tar.bz2
rsyslog-f521594d5979be7819df617df15d4074999fc860.zip
Merge branch 'v7-stable' into v7-devel
-rw-r--r--tests/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d95b0766..a06c2a0b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,7 +54,7 @@ TESTS += \
imuxsock_ccmiddle_root.sh \
udp-msgreduc-vg.sh \
udp-msgreduc-orgmsg-vg.sh \
- queue-persist.sh
+ queue-persist.sh \
discard-rptdmsg.sh \
discard-allmark.sh \
discard.sh \