diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-12 10:37:27 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-12 10:37:27 -0400 |
| commit | 0998a1a6a3f390a40b74f2cb3fbb36cb07e9c63e (patch) | |
| tree | f973caf076c1da285ec8482fe08d020124f3c336 | |
| parent | 4abba0474a751192b5abbd5a97c1817021aae337 (diff) | |
| parent | bff54ef395c97bfc370aff50a242134116a53275 (diff) | |
| download | cryptography-0998a1a6a3f390a40b74f2cb3fbb36cb07e9c63e.tar.gz cryptography-0998a1a6a3f390a40b74f2cb3fbb36cb07e9c63e.tar.bz2 cryptography-0998a1a6a3f390a40b74f2cb3fbb36cb07e9c63e.zip | |
Merge pull request #2271 from reaperhulk/eleventh-release-begins
reopen master for eleventh release
| -rw-r--r-- | CHANGELOG.rst | 6 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 21319f8b..900a3365 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,12 @@ Changelog ========= +1.1 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + + 1.0 - 2015-08-12 ~~~~~~~~~~~~~~~~ diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index ec537e15..d89a9fc7 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.0" +__version__ = "1.1.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 13fe152e..e3553803 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.0" +__version__ = "1.1.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |