From 3d990a623733ff97631e5df6561457b2cb7c195e Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Tue, 19 May 2015 01:53:06 +0100 Subject: [PATCH] Fix rest formatting and set final version number --HG-- branch : pytest-2.7 --- CHANGELOG | 4 ++-- doc/en/announce/release-2.7.0.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 87800c9c9..3e1bccc46 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -2.7.1.dev (compared to 2.7.0) +2.7.1 (compared to 2.7.0) ----------------------------- - fix issue731: do not get confused by the braces which may be present @@ -91,7 +91,7 @@ it from the "decorator" case. Thanks Tom Viner. - "python_classes" and "python_functions" options now support glob-patterns - for test discovery, as discussed in issue600. Thanks Ldiary Translations. + for test discovery, as discussed in issue600. Thanks Ldiary Translations. - allow to override parametrized fixtures with non-parametrized ones and vice versa (bubenkoff). diff --git a/doc/en/announce/release-2.7.0.txt b/doc/en/announce/release-2.7.0.txt index e9a9b28da..07ae44ca1 100644 --- a/doc/en/announce/release-2.7.0.txt +++ b/doc/en/announce/release-2.7.0.txt @@ -89,7 +89,7 @@ holger krekel it from the "decorator" case. Thanks Tom Viner. - "python_classes" and "python_functions" options now support glob-patterns - for test discovery, as discussed in issue600. Thanks Ldiary Translations. + for test discovery, as discussed in issue600. Thanks Ldiary Translations. - allow to override parametrized fixtures with non-parametrized ones and vice versa (bubenkoff).