summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-10-21 13:34:24 +0200
committerholger krekel <holger@merlinux.eu>2013-10-21 13:34:24 +0200
commitb0a5740898a67f0c1030a5bfe7339c1cc7355508 (patch)
tree4dad26e0eabb17177baa2561ed385101491eec06
parentbc8c4b3ebd83e31dbc84c86541bf42a8e6f48120 (diff)
downloadpytest-b0a5740898a67f0c1030a5bfe7339c1cc7355508.tar.gz
fix changelog
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 43a86c141..6d2217ff2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,7 +12,7 @@ Changes between 2.4.2 and 2.4.3
properly so that the pkg_resources.resource_stream method works properly.
Fixes issue366. Thanks for the investigations and full PR to Jason R. Coombs.
-- pytestconfig is now session-config as it is the same object during the
+- pytestconfig fixture is now session-scoped as it is the same object during the
whole test run. Fixes issue370.
- avoid one surprising case of marker malfunction/confusion::