summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Gedminas <marius@gedmin.as>2018-08-09 14:07:42 +0300
committerMarius Gedminas <marius@gedmin.as>2018-08-09 14:07:42 +0300
commit45abd79d8f449d13ed2e52d06495ee51979c7adb (patch)
treeb5debe937733b2d2ccc934bec1699c14d68bd9ec
parentbf3a3161675f8ab62796783992d3b3bfba1bbf9d (diff)
parent33015c846e4b230e5d6564057424255c3a457485 (diff)
downloadzope-security-45abd79d8f449d13ed2e52d06495ee51979c7adb.tar.gz
Reconcile git history
The 4.2.2 release was made off a branch that was never merged back into master!
-rw-r--r--CHANGES.rst2
-rw-r--r--setup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 3f1f5e7..900f827 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,7 +2,7 @@
Changes
=========
-4.2.2 (unreleased)
+4.2.2 (2018-01-11)
==================
- Make the pure-Python proxy on Python 2 *not* check permissions for
diff --git a/setup.py b/setup.py
index f3ce592..fa9e34f 100644
--- a/setup.py
+++ b/setup.py
@@ -132,7 +132,7 @@ TESTS_REQUIRE = [
setup(name='zope.security',
- version='4.2.2.dev0',
+ version='4.2.2',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Security Framework',