summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-07-24 13:47:51 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-07-24 13:47:51 +0100
commitbaf081cd3b040926e2d14dfd1c555307bba59245 (patch)
treeafca8b1c8ad1860b84cf5dbeff16205710e6bf74 /CHANGES.md
parentMerge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch (diff)
parent1.2.0rc2 (diff)
downloadsynapse-baf081cd3b040926e2d14dfd1c555307bba59245.tar.xz
Merge tag 'v1.2.0rc2' into develop
Bugfixes
--------

- Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index bb6bcb75ed..be3dc37137 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.2.0rc2 (2019-07-24)
+=============================
+
+Bugfixes
+--------
+
+- Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
+
+
 Synapse 1.2.0rc1 (2019-07-22)
 =============================