RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8347 from prometheus/release-2.24 

Merge release branch back into master after 2.24.0 is done
This commit is contained in:
Björn Rabenstein 2021-01-06 19:26:03 +01:00 committed by GitHub
parent 8dfbad7a88 02e92236a8
commit 0954026b9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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] Add TLS and basic authentication to HTTP endpoints. #8316
* [FEATURE] promtool: Add `check web-config` subcommand to check web config files. #8319 * [FEATURE] promtool: Add `check web-config` subcommand to check web config files. #8319

2
VERSION
View File

@ -1 +1 @@
2.24.0-rc.0 2.24.0