From 27fe3e2d4f415bc2e5ac0414ec7169c237930a6f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 8 Aug 2016 11:31:12 +0100
Subject: [PATCH] Bump changelog and version

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 1befcacdf..498eebe3e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,18 @@
+Changes in synapse v0.17.0 (2016-08-08)
+=======================================
+
+Changes:
+
+* Add federation /version API (PR #990)
+* Make psutil dependency optional (PR #992)
+
+
+Bug fixes:
+
+* Fix preview URL API to exclude html comments in description (PR #988)
+* Fix error handling of remote joins (PR #991)
+
+
 Changes in synapse v0.17.0-rc4 (2016-08-05)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 67ea8a8a9..a63ee565c 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-rc4"
+__version__ = "0.17.0"