summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-11-25 17:51:39 +0000
committerRichard van der Hoff <richard@matrix.org>2019-11-25 17:51:39 +0000
commit07929bd62f32c2e3ef244e9846364512de871bf7 (patch)
tree65226f6ecd4e2444e07e671b9158a59e90144f8e /synapse/__init__.py
parentImprove the performance of structured logging (#6322) (diff)
parent1.6.0rc2 (diff)
downloadsynapse-07929bd62f32c2e3ef244e9846364512de871bf7.tar.xz
Merge tag 'v1.6.0rc2' into develop
Synapse 1.6.0rc2 (2019-11-25)
=============================

Bugfixes
--------

- Fix a bug which could cause the background database update hander for event labels to get stuck in a loop raising exceptions. ([\#6407](https://github.com/matrix-org/synapse/issues/6407))
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1d962f5dc8..051c83774e 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.6.0rc1"
+__version__ = "1.6.0rc2"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when