From 82e71a259c7bb5beed351691747d34dca06da93a Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 28 Oct 2016 11:16:05 +0100
Subject: [PATCH] Bump changelog and version

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 61f14a2c3..0a04398c4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse v0.18.2-rc5 (2016-10-28)
+===========================================
+
+Bug fixes:
+
+* Fix prometheus process metrics in worker processes (PR #1184)
+
 Changes in synapse v0.18.2-rc4 (2016-10-27)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 81c9f3c23..7ae145956 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.18.2-rc4"
+__version__ = "0.18.2-rc5"