summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-19 15:13:36 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-19 15:13:36 +0000
commit39c3119c691d90cd745db31b175439737b04cd99 (patch)
tree2555ff233fd2e97734223582c96e502ef9fdb287
parentMerge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch (diff)
parent1.2.0rc2 (diff)
downloadsynapse-39c3119c691d90cd745db31b175439737b04cd99.tar.xz
1.2.0rc2
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/5734.bugfix1
-rw-r--r--synapse/__init__.py2
3 files changed, 10 insertions, 2 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) ============================= diff --git a/changelog.d/5734.bugfix b/changelog.d/5734.bugfix deleted file mode 100644
index 33aea5a94c..0000000000 --- a/changelog.d/5734.bugfix +++ /dev/null
@@ -1 +0,0 @@ -Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. diff --git a/synapse/__init__.py b/synapse/__init__.py
index f26e49da36..ca14545e4d 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.2.0rc1" +__version__ = "1.2.0rc2"