Merge pull request #8148 from Icinga/feature/2.11.5

htriem · web-flow · commit d12bffe5f46b · 2020-08-03T13:09:58.000+02:00
Icinga 2.11.5
diff --git a/.mailmap b/.mailmap
@@ -1,3 +1,4 @@
+Alexander A. Klimov <alexander.klimov@icinga.com> Alexander Aleksandrovič Klimov <alexander.klimov@icinga.com>
 <gunnar.beutner@icinga.com> <gunnar@beutner.name>
 <gunnar.beutner@icinga.com> <gunnar@blade9.beutner.name>
 <gunnar.beutner@icinga.com> <gunnar.beutner@netways.de>
@@ -40,4 +41,5 @@ Robin O'Brien <robin@labs.epiuse.com> <robinjohnobrien@gmail.com>
 Jens Schanz <jens.schanz@mueller.de> <mail@jensschanz.de>
 Jens Schanz <jens.schanz@mueller.de> Schanz, Jens <jens.schanz@mueller.de>
 Henrik Triem <Henrik.Triem@icinga.com> Henrik Triem <43344334+htriem@users.noreply.github.com>
+Henrik Triem <Henrik.Triem@icinga.com> <henrik.triem@icinga.com>
 nemtrif <ntrifunovic@hotmail.com> <nemtrif@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
@@ -226,6 +226,7 @@ Winfried Angele <winfried.angele@gmail.com>
 Wolfgang Nieder <wnd@gmx.net>
 Yannick Charton <tontonitch-pro@yahoo.fr>
 Yohan Jarosz <yohanjarosz@yahoo.fr>
+Yonas Habteab <yonas.habteab@icinga.com>
 Zachary McGibbon <zachary.mcgibbon@gmail.com>
 Zoltan Nagy <abesto@abesto.net>
 akrus <akrus@flygroup.st>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,19 @@ documentation before upgrading to a new release.
 
 Released closed milestones can be found on [GitHub](https://github.com/Icinga/icinga2/milestones?state=closed).
 
+## 2.11.5 (2020-08-05)
+
+Version 2.11.5 fixes file system race conditions
+in the config update process occurring in large HA environments
+and improves the cluster connection liveness mechanisms.
+
+### Bugfixes
+
+* Make the config update process mutually exclusive (Prevents file system race conditions) #8093
+* Consider a JsonRpcConnection alive on a single byte of TLS payload, not only on a whole message #8094
+* Send JsonRpcConnection heartbeat every 20s instead of 10s #8103
+* Use JsonRpcConnection heartbeat only to update connection liveness (m\_Seen) #8097
+
 ## 2.11.4 (2020-06-18)
 
 Version 2.11.4 fixes a crash during a heartbeat timeout with clients not yet signed. It also resolves
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-Version: 2.11.4
+Version: 2.11.5
 Revision: 1

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 +Alexander A. Klimov <[email protected]> Alexander Aleksandrovič Klimov <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 Jens Schanz <[email protected]> <[email protected]>
 Jens Schanz <[email protected]> Schanz, Jens <[email protected]>
 Henrik Triem <[email protected]> Henrik Triem <[email protected]>
 +Henrik Triem <[email protected]> <[email protected]>
 nemtrif <[email protected]> <[email protected]>
-Original file line number
+Diff line change
 Wolfgang Nieder <[email protected]>
 Yannick Charton <[email protected]>
 Yohan Jarosz <[email protected]>
 +Yonas Habteab <[email protected]>
 Zachary McGibbon <[email protected]>
 Zoltan Nagy <[email protected]>
 akrus <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Version: 2.11.4`
	`1`	`+Version: 2.11.5`
`2`	`2`	`Revision: 1`