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

Merge pull request #5744 from prometheus/release-2.11 

Merge Release 2.11 back into master
This commit is contained in:
Frederic Branczyk 2019-07-10 17:19:34 +02:00 committed by GitHub
parent dd598f906d e5b2249485
commit 28e56d974a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,4 +1,8 @@
## 2.11.0-rc.0 / 2019-07-04
## 2.11.1 / 2019-07-10
* [BUGFIX] Fix potential panic when prometheus is watching multiple zookeeper paths. #5749
## 2.11.0 / 2019-07-09
* [CHANGE] Remove `max_retries` from queue_config (it has been unused since rewriting remote-write to utilize the write-ahead-log). #5649
* [CHANGE] The meta file `BlockStats` no longer holds size information. This is now dynamically calculated and kept in memory. It also includes the meta file size which was not included before. tsdb#637

2
VERSION
View File

@ -1 +1 @@
2.11.0-rc.0
2.11.1