summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-10 09:58:32 +0100
committerErik Johnston <erik@matrix.org>2015-09-10 09:58:32 +0100
commit3f604816555040a501874c8638d861b66dcd960b (patch)
tree3aaedbbd4e5be2a2a6168d3bcce37a524e5a2f52
parentVarious bug fixes to crypto.keyring (diff)
downloadsynapse-3f604816555040a501874c8638d861b66dcd960b.tar.xz
Bump version and change log
-rw-r--r--CHANGES.rst6
-rw-r--r--synapse/__init__.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index a0a12ca4a0..1f6b712cbb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+Changes in synapse v0.10.0-r2 (2015-09-10)
+==========================================
+
+* Fix bug where we always fetched remote server signing keys instead of using
+  ones in our cache.
+
 Changes in synapse v0.10.0-r1 (2015-09-08)
 ==========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5b5ff6c3f3..d62294e6bb 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.10.0-r1"
+__version__ = "0.10.0-r2"