From e2f72ffed89e642987de85455b066911abe496a7 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 22 Sep 2015 10:59:23 +0200 Subject: [PATCH] start bugfix changelog on master --- CHANGELOG | 4 ++-- _pytest/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d17d29def..dab444fe4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ -2.8.x ------ +2.8.1.dev +--------- - (experimental) adapt more SEMVER style versioning and change meaning of master branch in git repo: "master" branch now keeps the bugfixes, changes diff --git a/_pytest/__init__.py b/_pytest/__init__.py index e1978cb35..1ceaa2760 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.8.0' +__version__ = '2.8.1.dev1'