Merge pull request prometheus#8506 from roidelapluie/release-225-final

Release 2.25.0
songjiayang · Feb 17, 2021 · a6be548 · a6be548
2 parents f0ae5f1 + c2410d4
commit a6be548
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.25.0-rc.0 / 2021-02-12
+## 2.25.0 / 2021-02-17
 
 This release includes a new `--enable-feature=` flag that enables
 experimental features. Such features might be changed or removed in the future.
@@ -20,6 +20,7 @@ Alertmanager API v2 was released in Alertmanager v0.16.0 (released in January
 * [ENHANCEMENT] TSDB: Reload blocks every minute, to detect new blocks and enforce retention more often. #8343
 * [BUGFIX] API: Fix global URL when external address has no port. #8359
 * [BUGFIX] Backfill: Fix error message handling. #8432
+* [BUGFIX] Backfill: Fix "add sample: out of bounds" error when series span an entire block. #8476
 * [BUGFIX] Deprecate unused flag --alertmanager.timeout. #8407
 * [BUGFIX] Mixins: Support remote-write metrics renamed in v2.23 in alerts. #8423
 * [BUGFIX] Remote: Fix garbage collection of dropped series in remote write. #8387

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.25.0-rc.0
+2.25.0
diff --git a/docs/disabled_features.md b/docs/disabled_features.md
@@ -16,7 +16,7 @@ They may be enabled by default in future versions.
 `--enable-feature=promql-at-modifier`
 
 The `@` modifier lets you specify the evaluation time for instant vector selectors,
-range vector selectors, and subqueries. More details can be found [here](querying/basics.md#-modifier).
+range vector selectors, and subqueries. More details can be found [here](querying/basics.md#modifier).
 
 ## Remote Write Receiver