summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-06-04 01:16:01 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2019-06-04 01:16:01 +1000
commit6f9f08005cd8973418662c716fec7c808e2cd0b2 (patch)
tree83af2f021f64c90003b94fce60f839a2bc6192aa /changelog.d
parentadd stuff in bg updates (diff)
parentMerge pull request #5307 from matrix-org/rav/server_keys/07-fix-notary-cache-... (diff)
downloadsynapse-6f9f08005cd8973418662c716fec7c808e2cd0b2.tar.xz
Merge remote-tracking branch 'origin/develop' into hawkowl/full-schema-v1
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/5226.misc1
-rw-r--r--changelog.d/5307.bugfix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/5226.misc b/changelog.d/5226.misc
new file mode 100644
index 0000000000..e1b9dc58a3
--- /dev/null
+++ b/changelog.d/5226.misc
@@ -0,0 +1 @@
+The base classes for the v1 and v2_alpha REST APIs have been unified.
diff --git a/changelog.d/5307.bugfix b/changelog.d/5307.bugfix
new file mode 100644
index 0000000000..6b152f4854
--- /dev/null
+++ b/changelog.d/5307.bugfix
@@ -0,0 +1 @@
+Fix bug where a notary server would sometimes forget old keys.