From eabb6b02df30d0cf959ec4fe7ca1dda8519f9ed9 Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Thu, 16 Jun 2016 13:12:34 -0700
Subject: [PATCH] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65cf0da1f..0d02b665d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ BUG FIXES:
     priority [GH-1183]
   * api: Tasks are no longer allowed to have slashes in their name [GH-1210]
   * client: Delete tmp files used to communicate with execcutor [GH-1241]
+  * client: Prvent the client from restoring with incorrect task state [GH-1294]
   * discovery: Ensure service and check names are unique [GH-1143, GH-1144]
   * driver/docker: Ensure docker client doesn't time out after a minute.
     [GH-1184]