From a40e8612b75fe2d82058d33e2d4aaa5e782c2344 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 16 May 2018 17:23:50 -0400 Subject: reopen master for 18.1 (#761) * reopen master for 18.1 * there are four dashes --- CHANGELOG.rst | 24 ++++++++++++++++++++++++ src/OpenSSL/version.py | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) 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/" -- cgit v1.2.1