aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-13 23:18:36 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-13 23:18:36 -0400
commitd9bb53472c4e49a85e2db03da1eb64bf66b50b28 (patch)
tree1f2fa126e0bf24e046ed30be16f166e7e1718fed
parent6199d8f04310aa22e862f8936fe47d895788daf3 (diff)
parentd5257ab7bb2c01d15a05e8c60935cf36e0ddcadf (diff)
downloadcryptography-d9bb53472c4e49a85e2db03da1eb64bf66b50b28.tar.gz
cryptography-d9bb53472c4e49a85e2db03da1eb64bf66b50b28.tar.bz2
cryptography-d9bb53472c4e49a85e2db03da1eb64bf66b50b28.zip
Merge pull request #1949 from reaperhulk/0.10-open-cycle
open master for tenth release
-rw-r--r--CHANGELOG.rst5
-rw-r--r--src/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 50935e84..e2f18909 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+0.10 - `master`_
+~~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
0.9 - 2015-05-13
~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index f5a48a9e..359cd819 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes"
" and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "0.9"
+__version__ = "0.10.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 40873953..f796fc37 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -14,7 +14,7 @@ __summary__ = "Test vectors for the cryptography package."
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "0.9"
+__version__ = "0.10.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"