summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-29 15:52:39 +0000
committerErik Johnston <erik@matrix.org>2019-10-29 15:52:39 +0000
commit74c1e16106fca0ec9126c3e218cd7763330c5cb0 (patch)
treeb6c8f4148e647e0f11f7125f140954d023ed84d6 /changelog.d
parentMake concurrently_execute work with async/await (diff)
parentFix CI for synapse_port_db (#6276) (diff)
downloadsynapse-74c1e16106fca0ec9126c3e218cd7763330c5cb0.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation_server_async_await
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/6276.misc2
-rw-r--r--changelog.d/6279.misc1
-rw-r--r--changelog.d/6286.bugfix1
3 files changed, 2 insertions, 2 deletions
diff --git a/changelog.d/6276.misc b/changelog.d/6276.misc
index 5f5144a9ee..4a4428251e 100644
--- a/changelog.d/6276.misc
+++ b/changelog.d/6276.misc
@@ -1 +1 @@
-Port `federation_server.py` to async/await.
+Add a CI job to test the `synapse_port_db` script.
diff --git a/changelog.d/6279.misc b/changelog.d/6279.misc
new file mode 100644
index 0000000000..5f5144a9ee
--- /dev/null
+++ b/changelog.d/6279.misc
@@ -0,0 +1 @@
+Port `federation_server.py` to async/await.
diff --git a/changelog.d/6286.bugfix b/changelog.d/6286.bugfix
deleted file mode 100644
index a4bebec1c7..0000000000
--- a/changelog.d/6286.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where room directory search was case sensitive.