diff options
| author | Alex Stapleton <alexs@prol.etari.at> | 2014-07-08 07:57:09 +0100 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-07-08 07:57:09 +0100 |
| commit | 5a3e0754f94a280783e0d5b9c1082097566fa62f (patch) | |
| tree | 6e335456b19a977d91bda003177f87eb9af79963 | |
| parent | d329d535d0a1598eae8dd63fd6d65ab7f5d30ad4 (diff) | |
| parent | 1757fe3de96bb821b19512a9df019ac7e0ad1061 (diff) | |
| download | cryptography-5a3e0754f94a280783e0d5b9c1082097566fa62f.tar.gz cryptography-5a3e0754f94a280783e0d5b9c1082097566fa62f.tar.bz2 cryptography-5a3e0754f94a280783e0d5b9c1082097566fa62f.zip | |
Merge pull request #1227 from reaperhulk/open-for-business
open master for development on the sixth release
| -rw-r--r-- | CHANGELOG.rst | 5 | ||||
| -rw-r--r-- | cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4b20cbf6..055c5abf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +0.6 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + 0.5.1 - 2014-07-07 ~~~~~~~~~~~~~~~~~~ diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 527b18c4..eb022fbd 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.5.1" +__version__ = "0.6.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 34f64498..a8dab84d 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.5.1" +__version__ = "0.6.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |