mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #8612 from prometheus/release-2.25

Browse source 
merge back release 2.25 to main
This commit is contained in:
Julien Pivotto 2021-03-17 13:35:04 +01:00 committed by GitHub
parent 36417663ea bda05a23ad
commit 76d29d21d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
## 2.25.2 / 2021-03-16
* [BUGFIX] Fix the ingestion of scrapes when the wall clock changes, e.g. on suspend. #8601
## 2.25.1 / 2021-03-14
* [BUGFIX] Fix a crash in `promtool` when a subquery with default resolution is used. #8569

2
VERSION
View file

@ -1 +1 @@
2.25.1
2.25.2