summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanielle Jenkins <d@d6e.io>2016-06-20 15:33:27 +0200
committerDanielle Jenkins <d@d6e.io>2016-06-20 15:33:27 +0200
commit2c61240ae5f7882071885d8550161f57e554e6a5 (patch)
tree850540c945531098bf5cfee346768af301968683
parent6840bf25001b19fa6c3807589059ad6edd005d54 (diff)
parent453ecceeca7221a11c9fa8acf58095d5a729968c (diff)
downloadtox-2c61240ae5f7882071885d8550161f57e554e6a5.tar.gz
Merged in d0ugal/tox/d0ugal/correct-forcedeps-to-be-forcedep-in-the--1457531878676 (pull request #191)
Correct --force-deps to be --force-dep in the CHANGELOG.
-rw-r--r--CHANGELOG6
1 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 81a5803..c92527a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -63,7 +63,7 @@
- fix issue99: the {env:...} substitution now properly uses environment
settings from the ``setenv`` section. Thanks Itxaka Serrano.
-- fix issue281: make --force-deps work when urls are present in
+- fix issue281: make --force-dep work when urls are present in
dependency configs. Thanks Glyph Lefkowitz for reporting.
- fix issue174: add new ``ignore_outcome`` testenv attribute which
@@ -182,7 +182,7 @@
1.9.2
-----------
-- backout ability that --force-deps substitutes name/versions in
+- backout ability that --force-dep substitutes name/versions in
requirement files due to various issues.
This fixes issue228, fixes issue230, fixes issue231
which popped up with 1.9.1.
@@ -193,7 +193,7 @@
- use a file instead of a pipe for command output in "--result-json".
Fixes some termination issues with python2.6.
-- allow --force-deps to override dependencies in "-r" requirements
+- allow --force-dep to override dependencies in "-r" requirements
files. Thanks Sontek for the PR.
- fix issue227: use "-m virtualenv" instead of "-mvirtualenv" to make