From bbdc9bc382e0f36e4d6a278e3559fcee2cc47a50 Mon Sep 17 00:00:00 2001
From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 20 Mar 2017 11:14:08 -0700
Subject: [PATCH] [master] ChangeLog updated after 102 merge.

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

diff --git a/ChangeLog b/ChangeLog
index 69f9b271a5..b0ff8bce30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1227.	[func]		fdupont, tomek
+	Additional commands: version-get, build-report have been
+	implemented for DHCPv4, DHCPv6 and Control Agent
+	components. Control Agent also now supports shutdown command.
+	(Trac #102, git 9d2b8326fc032876d74c1768c61c630987c25cc5)
+
 1226.	[func]		fdupont
 	Command line option -t support added to libprocess and implemented
 	for kea-dhcp-ddns and kea-ctrl-agent. It allows configuration sanity
-- 
2.47.3