mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-10 21:37:26 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #4800 from brancz/cherrypick-4794

Browse source 
cherrypick 4794
This commit is contained in:
Frederic Branczyk 2018-10-30 10:05:32 +01:00 committed by GitHub
parent ebc5ce9f81 4d37b1688a
commit 68ea9840eb
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.5.0-rc.1 / 2018-10-29
* [BUGFIX] Fix accidental breaking change in targets API exposition format.
## 2.5.0-rc.0 / 2018-10-24 ## 2.5.0-rc.0 / 2018-10-24
* [CHANGE] Marathon SD: Various changes to adapt to Marathon 1.5+. #4499 * [CHANGE] Marathon SD: Various changes to adapt to Marathon 1.5+. #4499

2
VERSION
View file

@ -1 +1 @@
2.5.0-rc.0 2.5.0-rc.1