summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorMark Hirota <mhirota@impinj.com>2015-02-11 11:35:56 -0800
committerMark Hirota <mhirota@impinj.com>2015-02-11 11:35:56 -0800
commite191187e70273f77b3df8f8e36ef657b843721ed (patch)
tree39cca170062ee54060281acbf34a59163a0257e2 /CHANGELOG
parentbbb20864027197f81b901850cac6787e47c08803 (diff)
parent655ecc51e9804d98814841f15fdbadae290c97d5 (diff)
downloadtox-e191187e70273f77b3df8f8e36ef657b843721ed.tar.gz
Merged hpk42/tox into default; Resolved conflict in CHANGELOG
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1b19722..8ccd135 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,9 @@
- echo output to stdout when ``--report-json`` is used
+- fix issue11: add a ``skip_install`` per-testenv setting which
+ prevents the installation of a package. Thanks Julian Krause.
+
- fix issue124: ignore command exit codes; when a command has a "-" prefix,
tox will ignore the exit code of that command