summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-09-12 09:54:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-09-12 09:54:46 +0200
commite0897fbe64bac6b6d2a2573942ea3373bba31414 (patch)
treea88c47ea40ab41ddb9a5cdc2bbebf141ca885fec
parentdb5b81ae6b0632e7e3b0d47b28a064423c1ac156 (diff)
parent15921d4e4e9d03e0cfd4ca5a9745c89b5dcd37c3 (diff)
downloadrsyslog-e0897fbe64bac6b6d2a2573942ea3373bba31414.tar.gz
rsyslog-e0897fbe64bac6b6d2a2573942ea3373bba31414.tar.bz2
rsyslog-e0897fbe64bac6b6d2a2573942ea3373bba31414.zip
Merge branch 'v7-stable'
Conflicts: plugins/omelasticsearch/omelasticsearch.c runtime/cryprov.h
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fceeb093..9bb5e661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,6 +98,8 @@ Version 7.5.0 [devel] 2013-06-11
Version 7.4.5 [v7.4-stable] 2013-09-??
- bugfix: some more build problems with newer json-c versions
Thanks to Michael Biebl for mentioning the problem.
+- bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled
+ Thanks to Jonny Törnbom for reporting this problem
---------------------------------------------------------------------------
Version 7.4.4 [v7.4-stable] 2013-09-03
- better error messages in GuardTime signature provider