Merge branch 'release-v1.102' into develop

11 files changed, 38 insertions, 9 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 9fedd57971..cb67babbac 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,34 @@
+# Synapse 1.102.0rc1 (2024-02-20)
+
+### Features
+
+- A metric was added for emails sent by Synapse, broken down by type: `synapse_emails_sent_total`. Contributed by Remi Rampin. ([\#16881](https://github.com/element-hq/synapse/issues/16881))
+
+### Bugfixes
+
+- Do not send multiple concurrent requests for keys for the same server. ([\#16894](https://github.com/element-hq/synapse/issues/16894))
+- Fix performance issue when joining very large rooms that can cause the server to lock up. Introduced in v1.100.0. ([\#16903](https://github.com/element-hq/synapse/issues/16903))
+- Always prefer unthreaded receipt when >1 exist ([MSC4102](https://github.com/matrix-org/matrix-spec-proposals/pull/4102)). ([\#16927](https://github.com/element-hq/synapse/issues/16927))
+
+### Improved Documentation
+
+- Fix a small typo in the Rooms section of the Admin API documentation. Contributed by @RainerZufall187. ([\#16857](https://github.com/element-hq/synapse/issues/16857))
+
+### Internal Changes
+
+- Don't invalidate the entire event cache when we purge history. ([\#16905](https://github.com/element-hq/synapse/issues/16905))
+- Add experimental config option to not send device list updates for specific users. ([\#16909](https://github.com/element-hq/synapse/issues/16909))
+- Fix incorrect docker hub link in release script. ([\#16910](https://github.com/element-hq/synapse/issues/16910))
+
+
+
+### Updates to locked dependencies
+
+* Bump attrs from 23.1.0 to 23.2.0. ([\#16899](https://github.com/element-hq/synapse/issues/16899))
+* Bump bcrypt from 4.0.1 to 4.1.2. ([\#16900](https://github.com/element-hq/synapse/issues/16900))
+* Bump pygithub from 2.1.1 to 2.2.0. ([\#16902](https://github.com/element-hq/synapse/issues/16902))
+* Bump sentry-sdk from 1.40.0 to 1.40.3. ([\#16898](https://github.com/element-hq/synapse/issues/16898))
+
 # Synapse 1.101.0 (2024-02-13)
 
 ### Bugfixes
diff --git a/changelog.d/16857.doc b/changelog.d/16857.doc
deleted file mode 100644
index 2382e65984..0000000000
--- a/changelog.d/16857.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix a small typo in the Rooms section of the Admin API documentation. Contributed by @RainerZufall187.
\ No newline at end of file
diff --git a/changelog.d/16881.feature b/changelog.d/16881.feature
deleted file mode 100644
index d1c8cc304e..0000000000
--- a/changelog.d/16881.feature
+++ /dev/null
@@ -1 +0,0 @@
-A metric was added for emails sent by Synapse, broken down by type: `synapse_emails_sent_total`. Contributed by Remi Rampin.
diff --git a/changelog.d/16894.bugfix b/changelog.d/16894.bugfix
deleted file mode 100644
index 7e05370be7..0000000000
--- a/changelog.d/16894.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not send multiple concurrent requests for keys for the same server.
diff --git a/changelog.d/16903.bugfix b/changelog.d/16903.bugfix
deleted file mode 100644
index 85a909b681..0000000000
--- a/changelog.d/16903.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix performance issue when joining very large rooms that can cause the server to lock up. Introduced in v1.100.0.
diff --git a/changelog.d/16905.misc b/changelog.d/16905.misc
deleted file mode 100644
index c5f47eb3e9..0000000000
--- a/changelog.d/16905.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't invalidate the entire event cache when we purge history.
diff --git a/changelog.d/16909.misc b/changelog.d/16909.misc
deleted file mode 100644
index f958936584..0000000000
--- a/changelog.d/16909.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add experimental config option to not send device list updates for specific users.
diff --git a/changelog.d/16910.misc b/changelog.d/16910.misc
deleted file mode 100644
index e8c57d2406..0000000000
--- a/changelog.d/16910.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect docker hub link in release script.
diff --git a/changelog.d/16927.bugfix b/changelog.d/16927.bugfix
deleted file mode 100644
index ecc62a148c..0000000000
--- a/changelog.d/16927.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Always prefer unthreaded receipt when >1 exist ([MSC4102](https://github.com/matrix-org/matrix-spec-proposals/pull/4102)).
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 33a658b66c..a2170c1220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.102.0~rc1) stable; urgency=medium
+
+  * New Synapse release 1.102.0rc1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 20 Feb 2024 15:50:36 +0000
+
 matrix-synapse-py3 (1.101.0) stable; urgency=medium
 
   * New Synapse release 1.101.0.
diff --git a/pyproject.toml b/pyproject.toml
index cd8bb39422..e1ffb9ffef 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.101.0"
+version = "1.102.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"