diff options
| author | Erik Johnston <erik@matrix.org> | 2021-07-29 11:08:49 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-07-29 11:08:49 +0100 |
| commit | c36c2777900284cf94e93e60e34c3b856bb31551 (patch) | |
| tree | 5079c397821dab6f70dd0200a4c435c1b1d91db7 /synapse/state/v1.py | |
| parent | Merge tag 'v1.38.1' (diff) | |
| parent | Fixup changelog (diff) | |
| download | synapse-c36c2777900284cf94e93e60e34c3b856bb31551.tar.xz | |
Merge tag 'v1.39.0rc3'
Synapse 1.39.0rc3 (2021-07-28) ============================== Bugfixes -------- - Fix a bug introduced in Synapse 1.38 which caused an exception at startup when SAML authentication was enabled. ([\#10477](https://github.com/matrix-org/synapse/issues/10477)) - Fix a long-standing bug where Synapse would not inform clients that a device had exhausted its one-time-key pool, potentially causing problems decrypting events. ([\#10485](https://github.com/matrix-org/synapse/issues/10485)) - Fix reporting old R30 stats as R30v2 stats. Introduced in v1.39.0rc1. ([\#10486](https://github.com/matrix-org/synapse/issues/10486)) Internal Changes ---------------- - Fix an error which prevented the Github Actions workflow to build the docker images from running. ([\#10461](https://github.com/matrix-org/synapse/issues/10461)) - Fix release script to correctly version debian changelog when doing RCs. ([\#10465](https://github.com/matrix-org/synapse/issues/10465))
Diffstat (limited to 'synapse/state/v1.py')
| -rw-r--r-- | synapse/state/v1.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index 318e998813..267193cedf 100644 --- a/synapse/state/v1.py +++ b/synapse/state/v1.py @@ -159,7 +159,7 @@ def _seperate( """ state_set_iterator = iter(state_sets) unconflicted_state = dict(next(state_set_iterator)) - conflicted_state = {} # type: MutableStateMap[Set[str]] + conflicted_state: MutableStateMap[Set[str]] = {} for state_set in state_set_iterator: for key, value in state_set.items(): |