Merge pull request pyca#1369 from reaperhulk/sixth-release

alex · alex · commit b2ab5ef112f8 · 2014-09-29T19:17:41.000-07:00
Bump version and set changelog date for 0.6 release
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,10 +1,8 @@
 Changelog
 =========
 
-0.6 - `master`_
-~~~~~~~~~~~~~~~
-
-.. note:: This version is not yet released and is under active development.
+0.6 - 2014-09-29
+~~~~~~~~~~~~~~~~
 
 * Added
   :func:`~cryptography.hazmat.primitives.serialization.load_pem_private_key` to
diff --git a/cryptography/__about__.py b/cryptography/__about__.py
@@ -22,7 +22,7 @@
                " and primitives to Python developers.")
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "0.6.dev1"
+__version__ = "0.6"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
@@ -22,7 +22,7 @@
 
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "0.6.dev1"
+__version__ = "0.6"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"
