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

…iation Conflicts: CHANGES.rst
zopefoundation · Nov 17, 2016 · 1461350 · 1461350
2 parents f54d6e2 + 14aa616
commit 1461350
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,9 @@
   ``undoLog`` and ``undoInfo`` are available on database objects.
   (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
   to store a blob into a temporary changes before reading a blob. See
   `issue 103 <https://github.com/zopefoundation/ZODB/issues/103>`_.

diff --git a/README.rst b/README.rst
@@ -18,9 +18,6 @@ Compatibility
 
 ZODB 5 requires Python 2.7 (>= 2.7.9) or Python >= 3.3.
 
-Travis: |buildstatus|_
-winbot: |winbotstatus|_
-
 Documentation
 =============
 
@@ -113,4 +110,4 @@ See http://zodb.org/
 
 .. image:: https://badges.gitter.im/zopefoundation/ZODB.svg
    :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
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
 interface, rich transaction support, and undo.
 """
 
-version = "5.0.0"
+version = "5.0.1"
 
 import os
 from setuptools import setup, find_packages