diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:52 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:52 +0100 |
| commit | 6efb2b0ad44b4cfb1f05a77c1a5a22b527758b37 (patch) | |
| tree | 56c11988292ef856c99e8fb4f9b08b648e5d93d8 /changelog.d | |
| parent | Merge branch 'develop' into babolivier/mark_unread (diff) | |
| parent | Discard RDATA from already seen positions. (#7648) (diff) | |
| download | synapse-6efb2b0ad44b4cfb1f05a77c1a5a22b527758b37.tar.xz | |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/7648.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/7688.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/7689.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/7692.misc | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/7648.bugfix b/changelog.d/7648.bugfix new file mode 100644 index 0000000000..ff2417bfb6 --- /dev/null +++ b/changelog.d/7648.bugfix @@ -0,0 +1 @@ +In working mode, ensure that replicated data has not already been received. diff --git a/changelog.d/7688.bugfix b/changelog.d/7688.bugfix new file mode 100644 index 0000000000..2ed718a087 --- /dev/null +++ b/changelog.d/7688.bugfix @@ -0,0 +1 @@ +Fix "Starting db txn 'get_completed_ui_auth_stages' from sentinel context" warning. The bug was introduced in 1.13.0rc1. diff --git a/changelog.d/7689.bugfix b/changelog.d/7689.bugfix new file mode 100644 index 0000000000..10ad4c8c13 --- /dev/null +++ b/changelog.d/7689.bugfix @@ -0,0 +1 @@ +Compare the URI and method during user interactive authentication (instead of the URI twice). Bug introduced in 1.13.0rc1. diff --git a/changelog.d/7692.misc b/changelog.d/7692.misc new file mode 100644 index 0000000000..ef6cbe0005 --- /dev/null +++ b/changelog.d/7692.misc @@ -0,0 +1 @@ +Replace uses of `six.iterkeys`/`iteritems`/`itervalues` with `keys()`/`items()`/`values()`. |