[Pytest-commit] commit/tox: d6e: Merged in d0ugal/tox/d0ugal/correct-forcedeps-to-be-forcedep-in-the--1457531878676 (pull request #191)

[commits-noreply at bitbucket.org]

1 new commit in tox:

https://bitbucket.org/hpk42/tox/commits/b73716454bbf/
Changeset:   b73716454bbf
User:        d6e
Date:        2016-06-20 13:33:27+00:00
Summary:     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.
Affected #:  1 file

diff -r c07a9557351251619b76cbefb9622fcdf9377ca6 -r b73716454bbfee66e9b8db5a563d660114ffdbfa CHANGELOG
--- 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

Repository URL: https://bitbucket.org/hpk42/tox/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.