Andrew Morgan baf081cd3b 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))

2019-07-24 13:47:51 +01:00

..

federation

Replace returnValue with return (#5736)

2019-07-23 23:00:55 +10:00

__init__.py

Run Black. (#5482)

2019-06-20 19:32:02 +10:00

additional_resource.py

Run Black. (#5482)

2019-06-20 19:32:02 +10:00

client.py

Replace returnValue with return (#5736)

2019-07-23 23:00:55 +10:00

endpoint.py

Run Black. (#5482)

2019-06-20 19:32:02 +10:00

matrixfederationclient.py

Replace returnValue with return (#5736)

2019-07-23 23:00:55 +10:00

request_metrics.py

Move logging utilities out of the side drawer of util/ and into logging/ (#5606)

2019-07-04 00:07:04 +10:00

server.py

Fix servlet metric names (#5734)

2019-07-24 13:07:35 +01:00

servlet.py

Fix servlet metric names (#5734)

2019-07-24 13:07:35 +01:00

site.py

Move logging utilities out of the side drawer of util/ and into logging/ (#5606)

2019-07-04 00:07:04 +10:00