Merge pull request #8347 from prometheus/release-2.24

Merge release branch back into master after 2.24.0 is done
4 years ago · 0954026b9a
parent 8dfbad7a88 02e92236a8
commit 0954026b9a
2 changed files with 2 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,4 @@
-## 2.24.0-rc.0 / 2020-12-30
+## 2.24.0 / 2021-01-06

 * [FEATURE] Add TLS and basic authentication to HTTP endpoints. #8316
 * [FEATURE] promtool: Add `check web-config` subcommand to check web config files. #8319
--- a/2
+++ b/2
@ -1 +1 @@
-2.24.0-rc.0
+2.24.0