aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-03 08:57:13 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-03 08:57:13 -0500
commit50a048536c5443a86e47a967dadf38bc4241b593 (patch)
tree2201f2cca37ad62eedbbed1384d7c94caddbc036
parent9586201c1bfb8105eff683c23e5fe28378e59693 (diff)
downloadcryptography-50a048536c5443a86e47a967dadf38bc4241b593.tar.gz
cryptography-50a048536c5443a86e47a967dadf38bc4241b593.tar.bz2
cryptography-50a048536c5443a86e47a967dadf38bc4241b593.zip
update versions and reopen master
-rw-r--r--CHANGELOG.rst5
-rw-r--r--cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0826b0b1..54d6229f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+0.5 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
0.4 - 2014-05-03
~~~~~~~~~~~~~~~~
diff --git a/cryptography/__about__.py b/cryptography/__about__.py
index d1151dc5..ee53902b 100644
--- a/cryptography/__about__.py
+++ b/cryptography/__about__.py
@@ -22,7 +22,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes"
" and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "0.4"
+__version__ = "0.5.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 606fa39d..bbacbf5d 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -22,7 +22,7 @@ __summary__ = "Test vectors for the cryptography package."
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "0.4"
+__version__ = "0.5.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"