summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst17
-rw-r--r--synapse/__init__.py2
2 files changed, 18 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 3abd4d2b6b..4f952eecc4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,20 @@
+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)
+===========================================
+
+Bug fixes:
+
+* Fix ``user_threepids`` schema delta, which in some instances prevented
+  startup after upgrade (PR #1183)
+
+
 Changes in synapse v0.18.2-rc3 (2016-10-27)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2c5dcf59f7..7ae1459562 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-rc3"
+__version__ = "0.18.2-rc5"