diff options
author | Eric Eastwood <erice@element.io> | 2022-09-20 18:00:28 -0500 |
---|---|---|
committer | Eric Eastwood <erice@element.io> | 2022-09-20 18:00:28 -0500 |
commit | b86869feef313d57fe8e2169224b3e87a595bf13 (patch) | |
tree | 36a30fef154141835c5c76d6de17c695c9142dd3 /changelog.d/13718.misc | |
parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
parent | Merge branch 'release-v1.68' into develop (diff) | |
download | synapse-b86869feef313d57fe8e2169224b3e87a595bf13.tar.xz |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: .github/workflows/tests.yml poetry.lock synapse/storage/schema/__init__.py
Diffstat (limited to 'changelog.d/13718.misc')
-rw-r--r-- | changelog.d/13718.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/13718.misc b/changelog.d/13718.misc deleted file mode 100644 index 07ace50b12..0000000000 --- a/changelog.d/13718.misc +++ /dev/null @@ -1 +0,0 @@ -Add experimental configuration option to allow disabling legacy Prometheus metric names. \ No newline at end of file |