diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-11-30 08:23:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 13:23:53 +0000 |
| commit | 28f5252c1f5e675aafc12e86b1237d2bedcd1a3c (patch) | |
| tree | 51b5126ba27b789f2740b9cc5ff0fa711c85575b | |
| parent | synctl stop: wait for processes to exit (#11459) (diff) | |
| download | synapse-28f5252c1f5e675aafc12e86b1237d2bedcd1a3c.tar.xz | |
Add missing copyright header. (#11460)
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/11460.misc | 1 | ||||
| -rw-r--r-- | tests/federation/transport/test_client.py | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/changelog.d/11460.misc b/changelog.d/11460.misc new file mode 100644 index 0000000000..fc6bc82b36 --- /dev/null +++ b/changelog.d/11460.misc @@ -0,0 +1 @@ +Fix a bug introduced in 1.47.0 where `send_join` could fail due to an outdated `ijson` version. diff --git a/tests/federation/transport/test_client.py b/tests/federation/transport/test_client.py index 0b19159961..a7031a55f2 100644 --- a/tests/federation/transport/test_client.py +++ b/tests/federation/transport/test_client.py @@ -1,3 +1,17 @@ +# Copyright 2021 The Matrix.org Foundation C.I.C. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + import json from synapse.api.room_versions import RoomVersions |