Merge pull request #2420 from chriskuehl/master

Replace n-dash in HISTORY to workaround pip bug
This commit is contained in:
Cory Benfield
2015-01-23 07:19:39 +00:00
+1 -1
View File
@@ -103,7 +103,7 @@ Release History
- Support for connect timeouts! Timeout now accepts a tuple (connect, read) which is used to set individual connect and read timeouts.
- Allow copying of PreparedRequests without headers/cookies.
- Updated bundled urllib3 version.
- Refactored settings loading from environment new `Session.merge_environment_settings`.
- Refactored settings loading from environment -- new `Session.merge_environment_settings`.
- Handle socket errors in iter_content.