From 60a015550aa8eedd8540d803fd3abba7bd45bc68 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 24 Aug 2016 14:31:13 +0100
Subject: [PATCH] Bump changelog and version

---
 CHANGES.rst         | 14 ++++++++++++++
 synapse/__init__.py |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 885e74fd2..49673ccce 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,17 @@
+Changes in synapse v0.17.1 (2016-08-24)
+=======================================
+
+Changes:
+
+* Delete old received_transactions rows (PR #1038)
+* Pass through user-supplied content in /join/$room_id (PR #1039)
+
+
+Bug fixes:
+
+* Fix bug with backfill (PR #1040)
+
+
 Changes in synapse v0.17.1-rc1 (2016-08-22)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f80107aeb..43bf78f88 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.17.1-rc1"
+__version__ = "0.17.1"