aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-26 19:37:17 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-26 19:37:17 -0400
commit7e6172104ee755fa92f202a7fd47bca8d38f01da (patch)
treefb567c9522619890dec2fd54fdd6e544418a4e1b
parent5beefaeefb1d5d94087f7ebf9174bdac20835d51 (diff)
parent506a215915f9e9a4759655b65957317f48fcea34 (diff)
downloadcryptography-7e6172104ee755fa92f202a7fd47bca8d38f01da.tar.gz
cryptography-7e6172104ee755fa92f202a7fd47bca8d38f01da.tar.bz2
cryptography-7e6172104ee755fa92f202a7fd47bca8d38f01da.zip
Merge pull request #1992 from reaperhulk/one-point-oh
update all 0.10 to 1.0
-rw-r--r--CHANGELOG.rst2
-rw-r--r--docs/x509.rst2
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 07d903c1..88ff1962 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,7 +1,7 @@
Changelog
=========
-0.10 - `master`_
+1.0 - `master`_
~~~~~~~~~~~~~~~~
.. note:: This version is not yet released and is under active development.
diff --git a/docs/x509.rst b/docs/x509.rst
index 5e4d9bfa..d355edc7 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -724,7 +724,7 @@ X.509 Extensions
.. class:: OCSPNoCheck
- .. versionadded:: 0.10
+ .. versionadded:: 1.0
This presence of this extension indicates that an OCSP client can trust a
responder for the lifetime of the responder's certificate. CAs issuing
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 359cd819..9c28be2e 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.10.dev1"
+__version__ = "1.0.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 f796fc37..a8199ced 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.10.dev1"
+__version__ = "1.0.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"