Skip to content

Commit 8c26530

Browse files
sandhosesandhose
committed
Merge branch 'quenting/device-changes-off-main' into quenting/dedicated-mas-api
2 parents bd442af + d766b81 commit 8c26530

File tree

112 files changed

+1246
-747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1246
-747
lines changed

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎changelog.d/18581.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Allow workers to write to the device lists stream, offloading changes to devices off the main process.
1+
Enable workers to write directly to the device lists stream and handle device list updates, reducing load on the main process.

‎changelog.d/18604.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Refactor cache metrics to be homeserver-scoped.

‎changelog.d/18635.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Support arbitrary profile fields.

‎changelog.d/18675.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Include `event_id` when getting state with `?format=event`. Contributed by @tulir @ Beeper.

‎changelog.d/18677.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix sliding_sync_connections related errors when porting from SQLite to Postgres.

‎changelog.d/18691.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix the MAS integration not working when Synapse is started with `--daemonize` or using `synctl`.

‎changelog.d/18692.doc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update `rc_delayed_event_mgmt` docs to the actual nesting level. Contributed by @HarHarLinks.

‎docker/configure_workers_and_start.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@
179179
"^/_matrix/client/(api/v1|r0|v3|unstable)/account/3pid$",
180180
"^/_matrix/client/(api/v1|r0|v3|unstable)/account/whoami$",
181181
"^/_matrix/client/(api/v1|r0|v3|unstable)/devices(/|$)",
182+
"^/_matrix/client/(r0|v3)/delete_devices$",
182183
"^/_matrix/client/versions$",
183184
"^/_matrix/client/(api/v1|r0|v3|unstable)/voip/turnServer$",
184185
"^/_matrix/client/(r0|v3|unstable)/register$",

‎docs/usage/configuration/config_documentation.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,9 +1925,8 @@ This setting has the following sub-options:
19251925
Default configuration:
19261926
```yaml
19271927
rc_delayed_event_mgmt:
1928-
per_user:
1929-
per_second: 1.0
1930-
burst_count: 5.0
1928+
per_second: 1.0
1929+
burst_count: 5.0
19311930
```
19321931

19331932
Example configuration:

0 commit comments

Comments
 (0)