From c2a85d03c8cceeb82c47fe517e3bc32b716e33c2 Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Mon, 4 Jan 2016 11:45:47 -0800
Subject: [PATCH] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e025cefe..5d45e8447 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ IMPROVEMENTS:
   * driver/rkt: Add support for CPU/Memory isolation [GH-610]
   * cli: Output of agent-info is sorted [GH-617]
   * core: Node class constraint [GH-618]
+  * core: User specifiable kill timeout [GH-624]
 
 BUG FIXES:
   * cli: Handle parsing of un-named ports [GH-604]