20 files changed, 1 insertions, 10 deletions
diff --git a/changelog.d/3316.feature b/changelog.d/3316.feature
deleted file mode 100644
index 50068b7222..0000000000
--- a/changelog.d/3316.feature
+++ /dev/null
@@ -1 +0,0 @@
-Enforce the specified API for report_event
diff --git a/changelog.d/3351.misc b/changelog.d/3351.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3351.misc
+++ /dev/null
diff --git a/changelog.d/3463.misc b/changelog.d/3463.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3463.misc
+++ /dev/null
diff --git a/changelog.d/3464.misc b/changelog.d/3464.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3464.misc
+++ /dev/null
diff --git a/changelog.d/3496.feature b/changelog.d/3496.feature
deleted file mode 100644
index 6a06a7e755..0000000000
--- a/changelog.d/3496.feature
+++ /dev/null
@@ -1 +0,0 @@
-Include CPU time from database threads in request/block metrics.
diff --git a/changelog.d/3497.feature b/changelog.d/3497.feature
deleted file mode 100644
index 4e333155b6..0000000000
--- a/changelog.d/3497.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add CPU metrics for _fetch_event_list
diff --git a/changelog.d/3498.misc b/changelog.d/3498.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3498.misc
+++ /dev/null
diff --git a/changelog.d/3499.misc b/changelog.d/3499.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3499.misc
+++ /dev/null
diff --git a/changelog.d/3501.misc b/changelog.d/3501.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3501.misc
+++ /dev/null
diff --git a/changelog.d/3505.feature b/changelog.d/3505.feature
deleted file mode 100644
index ca1867f529..0000000000
--- a/changelog.d/3505.feature
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database consumption when processing large numbers of receipts
diff --git a/changelog.d/3521.feature b/changelog.d/3521.feature
deleted file mode 100644
index 6dced5f2ae..0000000000
--- a/changelog.d/3521.feature
+++ /dev/null
@@ -1 +0,0 @@
-Cache optimisation for /sync requests
\ No newline at end of file
diff --git a/changelog.d/3530.misc b/changelog.d/3530.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3530.misc
+++ /dev/null
diff --git a/changelog.d/3533.bugfix b/changelog.d/3533.bugfix
deleted file mode 100644
index 04cbbefd5f..0000000000
--- a/changelog.d/3533.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix queued federation requests being processed in the wrong order
diff --git a/changelog.d/3534.misc b/changelog.d/3534.misc
deleted file mode 100644
index 949c12dc69..0000000000
--- a/changelog.d/3534.misc
+++ /dev/null
@@ -1 +0,0 @@
-refactor: use parse_{string,integer} and assert's from http.servlet for deduplication
diff --git a/changelog.d/3535.misc b/changelog.d/3535.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3535.misc
+++ /dev/null
diff --git a/changelog.d/3540.misc b/changelog.d/3540.misc
deleted file mode 100644
index 99dcad8e46..0000000000
--- a/changelog.d/3540.misc
+++ /dev/null
@@ -1 +0,0 @@
-check isort for each PR
diff --git a/changelog.d/3541.feature b/changelog.d/3541.feature
deleted file mode 100644
index 24524136ea..0000000000
--- a/changelog.d/3541.feature
+++ /dev/null
@@ -1 +0,0 @@
-Optimisation to make handling incoming federation requests more efficient.
\ No newline at end of file
diff --git a/changelog.d/3544.misc b/changelog.d/3544.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3544.misc
+++ /dev/null
diff --git a/changelog.d/3546.bugfix b/changelog.d/3546.bugfix
deleted file mode 100644
index 921dc6e7b0..0000000000
--- a/changelog.d/3546.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that erasure requests are correctly honoured for publicly accessible rooms when accessed over federation.
\ No newline at end of file
diff --git a/changelog.d/3561.bugfix b/changelog.d/3561.bugfix
new file mode 100644
index 0000000000..9a197cd67f
--- /dev/null
+++ b/changelog.d/3561.bugfix
@@ -0,0 +1 @@
+Disable a noisy warning about logcontexts