From b2c290a6e5e7eb97c6f59ce3b9d1544970232c7b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 5 Aug 2016 11:16:54 +0100
Subject: [PATCH] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index d1c0a1b76..932cf60bd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,19 @@
+Changes in synapse v0.17.0-rc4 (2016-08-05)
+===========================================
+
+Changes:
+
+* Change the way we summarize URLs when previewing (PR #973)
+* Add new /state_ids federation API (PR #979)
+* Speed up processing of /state/ response (PR #986)
+
+Bug fixes:
+
+* Fix event persistence when event has already been partially persisted
+  (PR #975, #983, #985)
+* Fix port script to also copy across backfilled events (PR #982)
+
+
 Changes in synapse v0.17.0-rc3 (2016-08-02)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 67231e8d9..67ea8a8a9 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.0-rc3"
+__version__ = "0.17.0-rc4"