summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-02-10 09:56:42 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-10 09:56:42 +0000
commit3de57e706209d98a331265e6d5a51bfd24939a3b (patch)
tree4ec32b425f353f6ffe7d37fc6bd467a01ba4ec6d
parentfilter out m.room.aliases from the CS API until a better solution is specced ... (diff)
downloadsynapse-3de57e706209d98a331265e6d5a51bfd24939a3b.tar.xz
1.10.0rc3 v1.10.0rc3
-rw-r--r--CHANGES.md15
-rw-r--r--changelog.d/6878.feature1
-rw-r--r--changelog.d/6880.misc1
-rw-r--r--synapse/__init__.py2
4 files changed, 16 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index c2aa735908..4a81a04627 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,18 @@
+Synapse 1.10.0rc3 (2020-02-10)
+==============================
+
+Features
+--------
+
+- Filter out m.room.aliases from the CS API to mitigate abuse while a better solution is specced. ([\#6878](https://github.com/matrix-org/synapse/issues/6878))
+
+
+Internal Changes
+----------------
+
+- Fix continuous integration failures with old versions of `pip`, which were introduced by a release of the `zipp` library. ([\#6880](https://github.com/matrix-org/synapse/issues/6880))
+
+
 Synapse 1.10.0rc2 (2020-02-06)
 ==============================
 
diff --git a/changelog.d/6878.feature b/changelog.d/6878.feature
deleted file mode 100644
index af3e958a43..0000000000
--- a/changelog.d/6878.feature
+++ /dev/null
@@ -1 +0,0 @@
-Filter out m.room.aliases from the CS API to mitigate abuse while a better solution is specced.
diff --git a/changelog.d/6880.misc b/changelog.d/6880.misc
deleted file mode 100644
index 8344a6ed1e..0000000000
--- a/changelog.d/6880.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix continuous integration failures with old versions of `pip`, which were introduced by a release of the `zipp` library.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 4f1859bd57..36c0cf557a 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.10.0rc2"
+__version__ = "1.10.0rc3"
 
 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