From 4cbfd6e4812941ae452efc809b49a9d950b53dd2 Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Fri, 3 Jun 2016 14:14:29 -0700
Subject: [PATCH] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bde13fb1..b69e2826b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ IMPROVEMENTS:
     determine its effects [GH-1181]
 
 BUG FIXES:
+  * core: Fix a potential deadlock if establishing leadership fails and is
+    retried [GH-1231]
   * core: Do not restart successful batch jobs when the node is removed/drained
     [GH-1205]
   * core: Updated User, Meta or Resources in a task cause create/destroy updates