summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2016-07-04 09:33:32 -0400
committerNed Batchelder <ned@nedbatchelder.com>2016-07-04 09:33:32 -0400
commit56411a1bd2078bed23f886fda94a8e8096a4c5fb (patch)
tree12a49a270016582137268a7b414d96dbd5809db4
parent98539b47a2790255f633260bcd60243dc7b6647c (diff)
downloadpython-coveragepy-git-56411a1bd2078bed23f886fda94a8e8096a4c5fb.tar.gz
4.2 is mostly sprint work
-rw-r--r--CHANGES.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 470b17b0..0f5f02e5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,8 @@ Change history for Coverage.py
Unreleased
----------
+Work from the PyCon 2016 Sprints!
+
- BACKWARD INCOMPATIBILITY: the ``coverage combine`` command now ignores an
existing ``.coverage`` data file. It used to include that file in its
combining. This caused confusing results, and extra tox "clean" steps. If