diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-14 10:26:56 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-14 10:26:56 +0000 |
| commit | a65a5ea1250ade55eed97ded803e864b45c42a6d (patch) | |
| tree | 9a195e73bdf184d39e42cc44a8b03c1cd29d9a25 /changelog.d | |
| parent | lint (diff) | |
| parent | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 (diff) | |
| download | synapse-a65a5ea1250ade55eed97ded803e864b45c42a6d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account_data_sync
* 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/6220.feature | 1 | ||||
| -rw-r--r-- | changelog.d/6361.misc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/6220.feature b/changelog.d/6220.feature new file mode 100644 index 0000000000..8343e9912b --- /dev/null +++ b/changelog.d/6220.feature @@ -0,0 +1 @@ +Increase default room version from 4 to 5, thereby enforcing server key validity period checks. diff --git a/changelog.d/6361.misc b/changelog.d/6361.misc new file mode 100644 index 0000000000..324d74ebf9 --- /dev/null +++ b/changelog.d/6361.misc @@ -0,0 +1 @@ +Temporarily blacklist the failing unit test PurgeRoomTestCase.test_purge_room. |