summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-08-08 13:27:01 +0200
committerholger krekel <holger@merlinux.eu>2013-08-08 13:27:01 +0200
commit6ed5c19668de42a6968b64ce69928f8224f53310 (patch)
tree818d8a2042bd768750355039085ba23182579c2f
parente9d9e2e28503c53ac3a2fe5fbd2929c1443620ad (diff)
downloadtox-6ed5c19668de42a6968b64ce69928f8224f53310.tar.gz
fix issue109 and fix issue111: multiple "-e" options are now combined
(previously the last one would win). Thanks Anthon van der Neut.
-rwxr-xr-xCHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 92aea57..ba78e99 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
1.6.0.dev
-----------------
+- fix issue109 and fix issue111: multiple "-e" options are now combined
+ (previously the last one would win). Thanks Anthon van der Neut.
+
- add --result-json option to write out detailed per-venv information
into a json report file to be used by upstream tools.