From bb54f41736f545ebf8b7d647421ae0575bce5eca Mon Sep 17 00:00:00 2001
From: Andrew Godwin <andrewgodwin@eventbrite.com>
Date: Wed, 13 Jun 2018 11:55:20 -0700
Subject: [PATCH] Releasing 2.2.0

---
 CHANGELOG.txt      | 14 ++++++++++++++
 daphne/__init__.py |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5e40440..d4d5bbc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,17 @@
+2.2.0 (2018-06-13)
+------------------
+
+* HTTP timeouts have been removed by default, as they were only needed
+  with ASGI/Channels 1. You can re-enable them with the --http-timeout
+  argument to Daphne.
+
+* Occasional errors on application timeout for non-fully-opened sockets
+  and for trying to read closed requests under high load are fixed.
+
+* X-Forwarded-For headers are now correctly decoded in all environments
+  and no longer have unicode matching issues.
+
+
 2.1.2 (2018-05-24)
 ------------------
 
diff --git a/daphne/__init__.py b/daphne/__init__.py
index 4eabd0b..8a124bf 100755
--- a/daphne/__init__.py
+++ b/daphne/__init__.py
@@ -1 +1 @@
-__version__ = "2.1.2"
+__version__ = "2.2.0"