Commit 14613505 authored by Jim Fulton's avatar Jim Fulton

Merge remote-tracking branch 'origin/master' into storage-byte-appreciation

Conflicts:
	CHANGES.rst
parents f54d6e28 14aa616f
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
``undoLog`` and ``undoInfo`` are available on database objects. ``undoLog`` and ``undoInfo`` are available on database objects.
(They were always available, but not documented in the interface.) (They were always available, but not documented in the interface.)
5.0.1 (2016-11-17)
==================
- Fix an AttributeError that DemoStorage could raise if it was asked - Fix an AttributeError that DemoStorage could raise if it was asked
to store a blob into a temporary changes before reading a blob. See to store a blob into a temporary changes before reading a blob. See
`issue 103 <https://github.com/zopefoundation/ZODB/issues/103>`_. `issue 103 <https://github.com/zopefoundation/ZODB/issues/103>`_.
......
...@@ -18,9 +18,6 @@ Compatibility ...@@ -18,9 +18,6 @@ Compatibility
ZODB 5 requires Python 2.7 (>= 2.7.9) or Python >= 3.3. ZODB 5 requires Python 2.7 (>= 2.7.9) or Python >= 3.3.
Travis: |buildstatus|_
winbot: |winbotstatus|_
Documentation Documentation
============= =============
...@@ -113,4 +110,4 @@ See http://zodb.org/ ...@@ -113,4 +110,4 @@ See http://zodb.org/
.. image:: https://badges.gitter.im/zopefoundation/ZODB.svg .. image:: https://badges.gitter.im/zopefoundation/ZODB.svg
:alt: Join the chat at https://gitter.im/zopefoundation/ZODB :alt: Join the chat at https://gitter.im/zopefoundation/ZODB
:target: https://gitter.im/zopefoundation/ZODB?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge :target: https://gitter.im/zopefoundation/ZODB?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
\ No newline at end of file
...@@ -20,7 +20,7 @@ to application logic. ZODB includes features such as a plugable storage ...@@ -20,7 +20,7 @@ to application logic. ZODB includes features such as a plugable storage
interface, rich transaction support, and undo. interface, rich transaction support, and undo.
""" """
version = "5.0.0" version = "5.0.1"
import os import os
from setuptools import setup, find_packages from setuptools import setup, find_packages
......
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