summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-02-24 15:46:41 +0000
committerGitHub <noreply@github.com>2020-02-24 15:46:41 +0000
commita301934f4610ffce490fbb925aaa898aac2829bc (patch)
tree434bea439924bc29295fe2fe0b5774af55dab19b /changelog.d
parentFix minor issues with email config (#6962) (diff)
downloadsynapse-a301934f4610ffce490fbb925aaa898aac2829bc.tar.xz
Upsert room version when we join over federation (#6968)
This is intended as a precursor to storing room versions when we receive an
invite over federation, but has the happy side-effect of fixing #3374 at last.

In short: change the store_room with try/except to a proper upsert which
updates the right columns.
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/6968.bugfix1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/6968.bugfix b/changelog.d/6968.bugfix
new file mode 100644
index 0000000000..9965bfc0c3
--- /dev/null
+++ b/changelog.d/6968.bugfix
@@ -0,0 +1 @@
+Fix `duplicate key` error which was logged when rejoining a room over federation.