summary refs log tree commit diff
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2022-08-11 13:19:12 +0100
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2022-08-11 13:19:12 +0100
commit05bc059e0da538cec5267edc9b387ecb8a47b578 (patch)
tree1cd4e3c6652bfd5cfcb8d53ec3acd64541b96f62
parentUpdate the rejected state of events during resync (#13459) (diff)
parent1.65.0rc2 (diff)
downloadsynapse-05bc059e0da538cec5267edc9b387ecb8a47b578.tar.xz
Merge branch 'release-v1.65' into develop
-rw-r--r--CHANGES.md9
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
-rw-r--r--synapse/handlers/room_summary.py1
4 files changed, 17 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 823f4f40b3..0bc8f95855 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.65.0rc2 (2022-08-11)
+==============================
+
+Internal Changes
+----------------
+
+- Revert 'Remove the unspecced `room_id` field in the `/hierarchy` response. ([\#13365](https://github.com/matrix-org/synapse/issues/13365))' to give more time for clients to update. ([\#13501](https://github.com/matrix-org/synapse/issues/13501))
+
+
 Synapse 1.65.0rc1 (2022-08-09)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog
index 6e4bdc3a00..21115d7be2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.65.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.65.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 11 Aug 2022 11:38:18 +0100
+
 matrix-synapse-py3 (1.65.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.65.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index ad2224f564..a9f59a676f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.65.0rc1"
+version = "1.65.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"
diff --git a/synapse/handlers/room_summary.py b/synapse/handlers/room_summary.py
index ebd445adca..732b0310bc 100644
--- a/synapse/handlers/room_summary.py
+++ b/synapse/handlers/room_summary.py
@@ -453,6 +453,7 @@ class RoomSummaryHandler:
                 "type": e.type,
                 "state_key": e.state_key,
                 "content": e.content,
+                "room_id": e.room_id,
                 "sender": e.sender,
                 "origin_server_ts": e.origin_server_ts,
             }