Bump version to 1.2.4

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97f0e3097301107afb1ea2e9441feef381e3e3b3..9dba9d5673005ca91dbea4083aacc4c269d2c112 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
 
 set(APPLICATION_VERSION_MAJOR "1")
 set(APPLICATION_VERSION_MINOR "2")
-set(APPLICATION_VERSION_PATCH "3")
+set(APPLICATION_VERSION_PATCH "4")
 
 set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
 

diff --git a/ChangeLog b/ChangeLog
index 33a879ef935ddd05401092e3a373fa091a259fc3..b57d876be63e800ac2ca912842e14ba2378f47a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 ChangeLog
 ==========
 
+version 1.2.4 (released 2017-07-24)
+  * Added deadlock workaround for glibc < 2.24
+  * Fixed a possible deadlock bug if uid_wrapper is turned off
+
 version 1.2.3 (released 2017-07-14)
   * Logging is always turned on now
   * Fixed a memory leak