From 6f7c0e00755c33884569f994a528cdad65dd9e08 Mon Sep 17 00:00:00 2001
From: Michael Sarahan <msarahan@gmail.com>
Date: Wed, 22 Jun 2016 14:47:51 -0500
Subject: [PATCH] 1.21.1 release notes update

---
 CHANGELOG.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f06ad1e309..fcc2d1dba7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,21 @@
+2016-06-22 1.21.1:
+------------------
+
+Bug fixes / Improvements:
+-------------------------
+
+ * Simplify MSVC activation, using distutil's existing logic #1036
+ * Correctly interpret paths returned from git on windows, trying cygpath, falling back to conda regex #1037
+ * Fix ability to disable anaconda upload in condarc #1043
+ * Change environment activation to call activation in scripts, rather than having Python store variables #1044
+
+Contributors:
+-------------
+ * @msarahan
+ * @mwcraig
+ * @patricksnape
+
+
 2016-06-15 1.21.0:
 ------------------