summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 41892210..6bd82a0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,7 +29,7 @@ Version 6.5.0 [devel] 2012-08-28
Note: patches were released under ASL 2.0, see
http://bugzilla.adiscon.com/show_bug.cgi?id=353
---------------------------------------------------------------------------
-Version 6.4.1 [V6-STABLE] 2012-08-??
+Version 6.4.1 [V6-STABLE] 2012-09-06
- bugfix: multiple main queues with same queue file name were not detected
This lead to queue file corruption. While the root cause is a config
error, it is a bug that this important and hard to find config error
@@ -57,7 +57,8 @@ Version 6.4.1 [V6-STABLE] 2012-08-??
Thanks to Stefano Mason for alerting us of this bug.
- bugfix: Fixed TCP CheckConnection handling in omfwd.c. Interface needed
to be changed in lower stream classes. Syslog TCP Sending is now resumed
- properly.
+ properly. Unfixed, that lead to non-detection of downstate of remote
+ hosts.
---------------------------------------------------------------------------
Version 6.4.0 [V6-STABLE] 2012-08-20
- THIS IS THE FIRST VERSION OF THE 6.4.x STABLE BRANCH
diff --git a/Makefile.am b/Makefile.am
index eeb50311..95b432c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -247,7 +247,6 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \
--enable-gnutls \
--enable-imfile \
--enable-snmp \
- --enable-pgsql \
--enable-libdbi \
--enable-mysql \
--enable-relp \
@@ -264,7 +263,6 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \
--enable-imptcp \
--enable-imttcp \
--enable-omuxsock \
- --enable-extended-tests \
--enable-impstats \
--enable-memcheck \
--enable-pmaixforwardedfrom \
@@ -272,5 +270,8 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \
--enable-pmsnare \
--enable-mmsnmptrapd \
--enable-elasticsearch \
- --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+# temporarily disable these checks for make distcheck 2012-09-06 rgerhards
+# --enable-extended-tests \
+# --enable-pgsql \
ACLOCAL_AMFLAGS = -I m4