summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2019-01-21 14:53:36 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2019-01-21 13:53:36 -0600
commitf0a59cd8a9f945b437fdb07ad7fc8664fe0a9cf6 (patch)
treec9036b2b14f10f88d06cd9da82ef1df2afaf6d56
parentc9a71e155f08a4d9af36c97b22df9f4215e6c995 (diff)
downloadpyopenssl-git-f0a59cd8a9f945b437fdb07ad7fc8664fe0a9cf6.tar.gz
Reopen master for 19.1 (#810)
-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 2dda0d2..7d77f74 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.
+19.1.0 (UNRELEASED)
+-------------------
+
+
+Backward-incompatible changes:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*none*
+
+
+Deprecations:
+^^^^^^^^^^^^^
+
+*none*
+
+
+Changes:
+^^^^^^^^
+
+*none*
+
+
+----
+
19.0.0 (2019-01-21)
-------------------
diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
index 40f31c3..f03eeeb 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -11,7 +11,7 @@ __all__ = [
"__title__", "__uri__", "__version__",
]
-__version__ = "19.0.0"
+__version__ = "19.1.0.dev"
__title__ = "pyOpenSSL"
__uri__ = "https://pyopenssl.org/"