diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 15:34:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 15:34:25 +0200 |
| commit | 7860e4a393995662e5f82f0ecbb84dd28c7f0297 (patch) | |
| tree | 9e98988a05a9777fda68546b2442bbebd0ceac18 /tests/Makefile.am | |
| parent | 13d4a23e92996e24d6a833ca75d06428c5387aa4 (diff) | |
| parent | ba6be8f30789efe84dc9582e7fc2a117cb447caa (diff) | |
| download | rsyslog-7860e4a393995662e5f82f0ecbb84dd28c7f0297.tar.gz rsyslog-7860e4a393995662e5f82f0ecbb84dd28c7f0297.tar.xz rsyslog-7860e4a393995662e5f82f0ecbb84dd28c7f0297.zip | |
Merge branch 'master' into v5-devel
Conflicts:
tests/Makefile.am
tests/diag.sh
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 71daa3bc..14d15247 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -68,6 +68,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ diag.sh \ daqueue-persist.sh \ daqueue-persist-drvr.sh \ + testsuites/diag-common.conf \ queue-persist.sh \ queue-persist-drvr.sh \ testsuites/queue-persist.conf \ |