aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-03-09 07:07:49 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-03-09 07:07:49 -0400
commitbb4267b2f19e894c42887cfb17a0d492f3e113d1 (patch)
treed8a8a786a9b1b28450075c759ab8f6e24ce0c61d
parent3dd326767b34980f3095c67251d77a86bc9202fe (diff)
parent8ce597bff9678b8efdcd098012c415efccaab505 (diff)
downloadcryptography-bb4267b2f19e894c42887cfb17a0d492f3e113d1.tar.gz
cryptography-bb4267b2f19e894c42887cfb17a0d492f3e113d1.tar.bz2
cryptography-bb4267b2f19e894c42887cfb17a0d492f3e113d1.zip
Merge pull request #1736 from reaperhulk/0.9-open-for-business
reopen tree for 0.9 development work
-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 2ab9c755..518bc607 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+0.9 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
0.8 - 2015-03-08
~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index c760af71..0f8d4871 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.8"
+__version__ = "0.9.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 9e3a2431..189eb9f2 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.8"
+__version__ = "0.9.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"