From 4eca99ec830a1d43e554ef9b0a77c88bd3f9488e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Fri, 18 Dec 2015 18:17:38 +0100
Subject: Update changelog

---
 CHANGELOG.asciidoc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'CHANGELOG.asciidoc')

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 1f47bb6..42df81a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -1,5 +1,10 @@
 = CHANGELOG
 
+== 1.2.1
+
+* Fix bug preventing node shutdown when SSL is used with OTP 17.1+
+* Tune restart intensity in all supervisors
+
 == 1.2.0
 
 
-- 
cgit v1.2.3