Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
8 files changed, 6 insertions, 2 deletions
diff --git a/changelog.d/10253.misc b/changelog.d/10253.misc
new file mode 100644
index 0000000000..44d9217245
--- /dev/null
+++ b/changelog.d/10253.misc
@@ -0,0 +1 @@
+Fix type hints for computing auth events.
diff --git a/changelog.d/10256.misc b/changelog.d/10256.misc
new file mode 100644
index 0000000000..adef12fcb9
--- /dev/null
+++ b/changelog.d/10256.misc
@@ -0,0 +1 @@
+Improve the performance of the spaces summary endpoint by only recursing into spaces (and not rooms in general).
diff --git a/changelog.d/10269.bugfix b/changelog.d/10269.bugfix
deleted file mode 100644
index 3cefa05788..0000000000
--- a/changelog.d/10269.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Handle inbound events from federation asynchronously.
diff --git a/changelog.d/10272.bugfix b/changelog.d/10272.bugfix
deleted file mode 100644
index 3cefa05788..0000000000
--- a/changelog.d/10272.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Handle inbound events from federation asynchronously.
diff --git a/changelog.d/10279.bugfix b/changelog.d/10279.bugfix
new file mode 100644
index 0000000000..ac8b64ead9
--- /dev/null
+++ b/changelog.d/10279.bugfix
@@ -0,0 +1 @@
+Fix the prometheus `synapse_federation_server_pdu_process_time` metric. Broke in v1.37.1.
diff --git a/changelog.d/10282.bugfix b/changelog.d/10282.bugfix
new file mode 100644
index 0000000000..7ebda7cdc2
--- /dev/null
+++ b/changelog.d/10282.bugfix
@@ -0,0 +1 @@
+Fix a long-standing bug where Synapse would return errors after 2<sup>31</sup> events were handled by the server.
diff --git a/changelog.d/10286.bugfix b/changelog.d/10286.bugfix
new file mode 100644
index 0000000000..7ebda7cdc2
--- /dev/null
+++ b/changelog.d/10286.bugfix
@@ -0,0 +1 @@
+Fix a long-standing bug where Synapse would return errors after 2<sup>31</sup> events were handled by the server.
diff --git a/changelog.d/10288.doc b/changelog.d/10288.doc
new file mode 100644
index 0000000000..0739687b92
--- /dev/null
+++ b/changelog.d/10288.doc
@@ -0,0 +1 @@
+Fix homeserver config option name in presence router documentation.
|
