Merge remote-tracking branch 'origin/master' into work-with-transacti…

…on-changes Conflicts: CHANGES.rst setup.py
zopefoundation · Nov 18, 2016 · ec23bd8 · ec23bd8
2 parents f1c0f3a + bc74c38
commit ec23bd8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,6 +3,12 @@ Changelog
 
 - Fixed: ZEO needed changes to work with recent transaction changes.
 
+5.0.3 (2016-11-18)
+------------------
+
+- Temporarily require non-quite-current versions of ZODB and
+  transaction until we can sort out some recent breakage.
+
 5.0.2 (2016-11-02)
 ------------------
 

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-version = '5.0.2'
+version = '5.0.3'
 
 from setuptools import setup, find_packages
 import os