Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_apis_move

29 files changed, 10 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/3415.misc
index e69de29bb2..e69de29bb2 100644
--- a/changelog.d/3351.misc
+++ b/changelog.d/3415.misc
diff --git a/changelog.d/3463.misc b/changelog.d/3460.misc
index e69de29bb2..e69de29bb2 100644
--- a/changelog.d/3463.misc
+++ b/changelog.d/3460.misc
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/3520.bugfix b/changelog.d/3520.bugfix
new file mode 100644
index 0000000000..9278cb3708
--- /dev/null
+++ b/changelog.d/3520.bugfix
@@ -0,0 +1 @@
+Correctly announce deleted devices over federation
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/3548.bugfix b/changelog.d/3548.bugfix
new file mode 100644
index 0000000000..38dc3b1232
--- /dev/null
+++ b/changelog.d/3548.bugfix
@@ -0,0 +1 @@
+Catch failures saving metrics captured by Measure, and instead log the faulty metrics information for further analysis.
diff --git a/changelog.d/3552.misc b/changelog.d/3552.misc
new file mode 100644
index 0000000000..709c3282b4
--- /dev/null
+++ b/changelog.d/3552.misc
@@ -0,0 +1 @@
+Release notes are now in the Markdown format.
diff --git a/changelog.d/3553.feature b/changelog.d/3553.feature
new file mode 100644
index 0000000000..77a294cb9f
--- /dev/null
+++ b/changelog.d/3553.feature
@@ -0,0 +1 @@
+Add metrics to track resource usage by background processes
diff --git a/changelog.d/3554.feature b/changelog.d/3554.feature
new file mode 100644
index 0000000000..b00397872c
--- /dev/null
+++ b/changelog.d/3554.feature
@@ -0,0 +1 @@
+Add `code` label to `synapse_http_server_response_time_seconds` prometheus metric
diff --git a/changelog.d/3556.feature b/changelog.d/3556.feature
new file mode 100644
index 0000000000..77a294cb9f
--- /dev/null
+++ b/changelog.d/3556.feature
@@ -0,0 +1 @@
+Add metrics to track resource usage by background processes
diff --git a/changelog.d/3559.misc b/changelog.d/3559.misc
new file mode 100644
index 0000000000..26df859e45
--- /dev/null
+++ b/changelog.d/3559.misc
@@ -0,0 +1 @@
+add config for pep8
diff --git a/changelog.d/3464.misc b/changelog.d/3562.misc
index e69de29bb2..e69de29bb2 100644
--- a/changelog.d/3464.misc
+++ b/changelog.d/3562.misc
diff --git a/changelog.d/3570.bugfix b/changelog.d/3570.bugfix
new file mode 100644
index 0000000000..cec5158a99
--- /dev/null
+++ b/changelog.d/3570.bugfix
@@ -0,0 +1 @@
+Fix potential stack overflow and deadlock under heavy load
\ No newline at end of file
diff --git a/changelog.d/3571.misc b/changelog.d/3571.misc
new file mode 100644
index 0000000000..8908324e68
--- /dev/null
+++ b/changelog.d/3571.misc
@@ -0,0 +1 @@
+Merge Linearizer and Limiter
diff --git a/changelog.d/3572.misc b/changelog.d/3572.misc
new file mode 100644
index 0000000000..8908324e68
--- /dev/null
+++ b/changelog.d/3572.misc
@@ -0,0 +1 @@
+Merge Linearizer and Limiter