From 742b071dd166fb59209f395124b0ce994380a296 Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Tue, 6 Nov 2018 09:19:43 +0100 Subject: [PATCH] *: Cut v2.5.0 Signed-off-by: Frederic Branczyk --- CHANGELOG.md | 9 +-------- VERSION | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c21ed48..d8ead7145 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,6 @@ -## 2.5.0-rc.2 / 2018-10-31 +## 2.5.0 / 2018-11-06 * [CHANGE] Group targets by scrape config instead of job name. #4806 #4526 - -## 2.5.0-rc.1 / 2018-10-29 - -* [BUGFIX] Fix accidental breaking change in targets API exposition format. #4783 - -## 2.5.0-rc.0 / 2018-10-24 - * [CHANGE] Marathon SD: Various changes to adapt to Marathon 1.5+. #4499 * [CHANGE] Discovery: Split `prometheus_sd_discovered_targets` metric by scrape and notify (Alertmanager SD) as well as by section in the respective configuration. #4753 * [FEATURE] Add OpenMetrics support for scraping (EXPERIMENTAL). #4700 diff --git a/VERSION b/VERSION index 73f097560..437459cd9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.0-rc.2 +2.5.0