Commit ec23bd8b authored by Jim Fulton's avatar Jim Fulton

Merge remote-tracking branch 'origin/master' into work-with-transaction-changes

Conflicts:
	CHANGES.rst
	setup.py
parents f1c0f3a7 bc74c389
...@@ -3,6 +3,12 @@ Changelog ...@@ -3,6 +3,12 @@ Changelog
- Fixed: ZEO needed changes to work with recent transaction changes. - 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) 5.0.2 (2016-11-02)
------------------ ------------------
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE. # FOR A PARTICULAR PURPOSE.
# #
############################################################################## ##############################################################################
version = '5.0.2' version = '5.0.3'
from setuptools import setup, find_packages from setuptools import setup, find_packages
import os import os
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment