aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-12-17 21:07:51 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-12-17 21:07:51 -0800
commit01499799f44fa95431d22415f8f1b7f26df55b1b (patch)
treeeeeccb6409f08581b46b5b66b64b94e5b829356a
parent4597edf00274c71c1f71f0e75d0c6bcfd62dcb8a (diff)
parent08120d79d88fe6de594211503abd70d43b43a114 (diff)
downloadcryptography-01499799f44fa95431d22415f8f1b7f26df55b1b.tar.gz
cryptography-01499799f44fa95431d22415f8f1b7f26df55b1b.tar.bz2
cryptography-01499799f44fa95431d22415f8f1b7f26df55b1b.zip
Merge pull request #1541 from reaperhulk/start-eighth
open master for eighth release development
-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 5f295f2b..cf2d568a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+0.8 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
0.7 - 2014-12-17
~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index f022b21d..f2700d57 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.7"
+__version__ = "0.8.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 5f36cb64..aa6fce09 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.7"
+__version__ = "0.8.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"