commit c0ee738a8460dc3551758400772978ed62a84d46
author Paul Kehrer <paul.l.kehrer@gmail.com> Fri Aug 26 22:59:49 2016 +0800
committer Alex Gaynor <alex.gaynor@gmail.com> Fri Aug 26 10:59:49 2016 -0400
tree 37b1694587ebbf6ba6974076855000b5a77c2967
parent 07ea3cd3ea23608ad5dfea008674d89e03cb1d33

update changelog and bump version for 1.5 release (#3111)

CHANGELOG.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f874073..6aeba4f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,10 +1,8 @@
 Changelog
 =========
 
-1.5 - `master`_
-~~~~~~~~~~~~~~~
-
-.. note:: This version is not yet released and is under active development.
+1.5 - 2016-08-26
+~~~~~~~~~~~~~~~~
 
 * Added
   :func:`~cryptography.hazmat.primitives.asymmetric.padding.calculate_max_pss_salt_length`.

src/cryptography/__about__.py

diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 15ed36d..3c38986 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@
                " and primitives to Python developers.")
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "1.5.dev1"
+__version__ = "1.5"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"

vectors/cryptography_vectors/__about__.py

diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index f756b9d..495b851 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -14,7 +14,7 @@
 
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "1.5.dev1"
+__version__ = "1.5"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"