From 8a4517fd17325fa0716ddda7a2eb7a0ad7b1e7f3 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 22 Sep 2015 11:05:19 +0200 Subject: [PATCH] re-add 2.8.x changelog so that MASTER can be merged into features wrt to the changelog --- CHANGELOG | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ed7d70b14..9d454770a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,19 @@ 2.9.0.dev --------- +2.8.x +----- + +- (experimental) adapt more SEMVER style versioning and change meaning of + master branch in git repo: "master" branch now keeps the bugfixes, changes + aimed for micro releases. "features" branch will only be be released + with minor or major pytest releases. + +- Fix issue #766 by removing documentation references to distutils. + Thanks Russel Winder. + +- Fix issue #411: Add __eq__ method to assertion comparison example. + Thanks Ben Webb. 2.8.0 -----------------------------