aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-10-11 20:31:09 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2017-10-11 08:31:09 -0400
commit0ed0e7e87b5e83270f4aca4efc630790c1fea429 (patch)
tree94fbd749e3e80e40a0222208c449d32d08f2b010 /CHANGELOG.rst
parente885bd65a871926a8866db92035d814e3d179bf7 (diff)
downloadcryptography-0ed0e7e87b5e83270f4aca4efc630790c1fea429.tar.gz
cryptography-0ed0e7e87b5e83270f4aca4efc630790c1fea429.tar.bz2
cryptography-0ed0e7e87b5e83270f4aca4efc630790c1fea429.zip
update changelog release date and bump version for 2.1 release (#3958)
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst6
1 files changed, 2 insertions, 4 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d029ce6f..49acbc6a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,10 +4,8 @@ Changelog
.. _v2-1:
-2.1 - `master`_
-~~~~~~~~~~~~~~~~~
-
-.. note:: This version is not yet released and is under active development.
+2.1 - 2017-10-11
+~~~~~~~~~~~~~~~~
* **FINAL DEPRECATION** Python 2.6 support is deprecated, and will be removed
in the next release of ``cryptography``.