summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-08-17 14:45:02 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-08-17 14:45:02 -0400
commite282a1f42c47484c4fa52b8321c4ee367a150f2d (patch)
tree0fbf973dbf3096399cd6a7cdc87e8055cdfe6f7f /CHANGES.txt
parentd1d7dc6411b95ca5908c9628b4d74079b774f458 (diff)
downloadpython-setuptools-git-e282a1f42c47484c4fa52b8321c4ee367a150f2d.tar.gz
Removed the --delete-conflicting and --ignore-conflicts-at-my-risk options, which have long been deprecated and indicated that they're not used.1.0
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b2e26770..a075c3c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,6 +36,8 @@ not all users will find 1.0 a drop-in replacement for 0.9.
be updated to account for this change.
* Issue #50: SyntaxErrors generated by `pkg_resources.invalid_marker` are
normalized for cross-implementation consistency.
+* Removed ``--ignore-conflicts-at-my-risk`` and ``--delete-conflicting``
+ options to easy_install. These options have been deprecated since 0.6a11.
-----
0.9.8