Update changelog to include 'master' (#596)

* Update changelog to include 'master'

* Include PR references

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6d5a8441e4e9ecfe0ae672976c60ac0a35625e1..a589d30ba92d124587d203dbb5dfd9939807e11d 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,34 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Master
+
+### Added
+
+- Added concurrency backend autodetection. (Pull #585)
+- Added `Client(backend='trio')` and `Client(backend='asyncio')` API. (Pull #585)
+- Added `response.stream_lines()` API. (Pull #575)
+- Added `response.is_error` API. (Pull #574)
+- Added support for `timeout=Timeout(5.0, connect_timeout=60.0)` styles. (Pull #593)
+
+### Fixed
+
+- Requests or Clients with `timeout=None` now correctly always disable timeouts. (Pull #592)
+- Request 'Authorization' headers now have priority over `.netrc` authentication info. (Commit 095b691)
+- Files without a filename no longer set a Content-Type in multipart data. (Commit ed94950)
+
+### Changed
+
+- HTTP/2 support is switched to "off by default", but can be enabled explicitly. (Pull #584)
+- Switched to `Client(http2=True)` API from `Client(http_versions=["HTTP/1.1", "HTTP/2"])`. (Pull #586)
+- Pool timeouts are now on the timeout configuration, not the pool limits configuration. (Pull #563)
+- The timeout configuration is now named `httpx.Timeout(...)`, not `httpx.TimeoutConfig(...)`. The old version currently remains as a synonym for backwards compatability.  (Pull #591)
+
 ## 0.8.0 (November 27, 2019)
 
 ### Removed
 
-- The syncronous API has been removed, in order to allow us to fundamentally change how we approach supporting both sync and async variants. (See #588 for more details.)
+- The synchronous API has been removed, in order to allow us to fundamentally change how we approach supporting both sync and async variants. (See #588 for more details.)
 
 ## 0.7.8 (November 17, 2019)