diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-28 19:57:40 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-28 19:57:40 -0400 |
| commit | 46a07705f1b9b6a4228eb56620f394675d4612f3 (patch) | |
| tree | c74f77bf80d73950c52464d156be3afef2cd05b0 | |
| parent | 246a44e78c0d370452b3c5508d5fdabbb1b04c99 (diff) | |
| parent | c5b430f7ec091c02017fd07c7871ea0a4b2de044 (diff) | |
| download | cryptography-46a07705f1b9b6a4228eb56620f394675d4612f3.tar.gz cryptography-46a07705f1b9b6a4228eb56620f394675d4612f3.tar.bz2 cryptography-46a07705f1b9b6a4228eb56620f394675d4612f3.zip | |
Merge pull request #2454 from reaperhulk/reopen-master
reopen master for development on the twelfth release
| -rw-r--r-- | CHANGELOG.rst | 5 | ||||
| -rw-r--r-- | src/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 9518a3d9..811a3517 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +1.2 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + 1.1 - 2015-10-28 ~~~~~~~~~~~~~~~~ diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 013ca3a9..fbc1e735 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__ = "1.1" +__version__ = "1.2.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 e96c2350..63f0b572 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__ = "1.1" +__version__ = "1.2.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |