From 7d45ef022846ec91123a6c88de10c89a54e43c20 Mon Sep 17 00:00:00 2001
From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 8 Jun 2017 16:58:07 +0200
Subject: [PATCH] [master] Added ChangeLog entry for #5189.

---
 ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 689d19c2ab..c9b8589006 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1259.	[func]		marcin
+	Implemented timeout for the control commands forwarded between
+	the Control Agent and Kea servers. The enhanced forwarding
+	mechanism uses asynchronous calls over the unix domain sockets.
+	It also detects the JSON structure boundaries when receiving it
+	over the stream sockets.
+	(Trac #5189, git e48d9399c215406f2dab1601d22d6c932b4af271)
+
 1258.	[bug]		fdupont
 	Fixed wrong python package path when kea-shell was configured
 	without a prefix.
-- 
2.47.2