diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-07-24 13:38:33 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-07-24 13:43:40 +0100 |
| commit | 2d573e2e2b7127882ab2c221fd554371e0274c76 (patch) | |
| tree | 0d88f8216071be21b6641b3360846d9ce4f990e8 | |
| parent | Fix servlet metric names (#5734) (diff) | |
| download | synapse-2d573e2e2b7127882ab2c221fd554371e0274c76.tar.xz | |
1.2.0rc2 v1.2.0rc2
| -rw-r--r-- | CHANGES.md | 9 | ||||
| -rw-r--r-- | changelog.d/5734.bugfix | 1 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
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" |