From 9c521ee290243eeeb1735ee98de6104bdc22456a Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 17 Jul 2017 14:59:03 -0400 Subject: [PATCH] Open master for 2.1 (#3788) --- CHANGELOG.rst | 5 +++++ src/cryptography/__about__.py | 2 +- vectors/cryptography_vectors/__about__.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 563c32e9ead7..9ce4b96a3f63 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +2.1 - - `master`_ +~~~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + 2.0 - 2017-07-17 ~~~~~~~~~~~~~~~~ diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 4b4b6dd04a5e..e99a87d1c819 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -14,7 +14,7 @@ " and primitives to Python developers.") __uri__ = "https://github.com/pyca/cryptography" -__version__ = "2.0" +__version__ = "2.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 9ee01dd02a7f..951ef354ce00 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -14,7 +14,7 @@ __uri__ = "https://github.com/pyca/cryptography" -__version__ = "2.0" +__version__ = "2.1.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org"