summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-05-16 17:23:50 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2018-05-16 17:23:50 -0400
commita40e8612b75fe2d82058d33e2d4aaa5e782c2344 (patch)
tree40353940191fa531c628adc8d000cec9fb162350
parent74de8a137d435d45c100b74cc971be556166a559 (diff)
downloadpyopenssl-git-a40e8612b75fe2d82058d33e2d4aaa5e782c2344.tar.gz
reopen master for 18.1 (#761)
* reopen master for 18.1 * there are four dashes
-rw-r--r--CHANGELOG.rst24
-rw-r--r--src/OpenSSL/version.py2
2 files changed, 25 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a7b9e58..a2da758 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,30 @@ Changelog
Versions are year-based with a strict backward-compatibility policy.
The third digit is only for regressions.
+18.1.0 (UNRELEASED)
+-------------------
+
+
+Backward-incompatible changes:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*none*
+
+
+Deprecations:
+^^^^^^^^^^^^^
+
+*none*
+
+
+Changes:
+^^^^^^^^
+
+*none*
+
+
+----
+
18.0.0 (2018-05-16)
-------------------
diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
index 4607bc4..93630b1 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -11,7 +11,7 @@ __all__ = [
"__title__", "__uri__", "__version__",
]
-__version__ = "18.0.0"
+__version__ = "18.1.0.dev0"
__title__ = "pyOpenSSL"
__uri__ = "https://pyopenssl.org/"