summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2014-05-10 12:17:53 +0200
committerholger krekel <holger@merlinux.eu>2014-05-10 12:17:53 +0200
commitf1dc157d43fc34d0479ea351c6299b4ff90c4c51 (patch)
treecb82704bb552e0b1961bf208f176a750a1d49def
parentc7f89fd7ec012f87deb319884387f575b87f6013 (diff)
downloadtox-f1dc157d43fc34d0479ea351c6299b4ff90c4c51.tar.gz
limit python hashseed to 1024 on Windows to prevent possible
memory errors.
-rw-r--r--CHANGELOG8
-rw-r--r--CONTRIBUTORS1
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 562c00d..1617043 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,14 +3,16 @@ development
- fix issue59: add option "--skip-missing-interpreters" which won't fail the
build if Python interpreters listed in tox.ini are missing. Thanks
- Alexandre Conrad for the PR.
+ Alexandre Conrad for PR104.
- fix issue164: better traceback info in case of failing test commands.
- Thanks Marc Abramowitz for the PR.
+ Thanks Marc Abramowitz for PR92.
- support optional env variable substitution, thanks Morgan Fainberg
- for the complete PR.
+ for PR86.
+- limit python hashseed to 1024 on Windows to prevent possible
+ memory errors. Thanks March Schlaich for the PR90.
1.7.1
---------
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3ba25f8..aeb597e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -25,3 +25,4 @@ Asmund Grammeltwedt
Ionel Maries Cristian
Alexandre Conrad
Morgan Fainberg
+Marc Schleich