summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-28 13:09:36 +0000
committerErik Johnston <erik@matrix.org>2020-01-28 13:09:36 +0000
commit77d9357226687a177c865bcdeaa0e750612fc078 (patch)
tree820f5ef11a03a91f8922ccc4e796b9d051fa8dd5
parentFix setting `mau_limit_reserved_threepids` config (#6793) (diff)
downloadsynapse-release-v1.9.1.tar.xz
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/6793.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 8a068ae8c9..4c413b72ee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.9.1 (2020-01-28)
+==========================
+
+Bugfixes
+--------
+
+- Fix bug where setting `mau_limit_reserved_threepids` config would cause Synapse to refuse to start. ([\#6793](https://github.com/matrix-org/synapse/issues/6793))
+
+
 Synapse 1.9.0 (2020-01-23)
 ==========================
 
diff --git a/changelog.d/6793.bugfix b/changelog.d/6793.bugfix
deleted file mode 100644
index 564d4596ea..0000000000
--- a/changelog.d/6793.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where setting `mau_limit_reserved_threepids` config would cause Synapse to refuse to start.
diff --git a/debian/changelog b/debian/changelog
index 49f3187691..74eb29c5ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.9.1) stable; urgency=medium
+
+  * New synapse release 1.9.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 28 Jan 2020 13:09:23 +0000
+
 matrix-synapse-py3 (1.9.0) stable; urgency=medium
 
   * New synapse release 1.9.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6236e13aa3..a236888d3c 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.9.0"
+__version__ = "1.9.1"
 
 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