Merge 2.30.4 and 2.31.2 into main (#10049)

* Fix queries after a failed snapshot replay (#9980) (#9987)

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix queries after a failed snapshot replay (#9980) (#9986)

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Cut v2.30.4 (#9988)

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Cut v2.31.2 (#9989)

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
This commit is contained in:
Ganesh Vernekar 2021-12-20 22:37:35 +05:30 committed by GitHub
commit b8565c5884
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -36,6 +36,10 @@ Learn more about the Prometheus Agent in our [blog post](https://prometheus.io/b
* [BUGFIX] Uyuni SD: Fix null pointer exception during initialization. #9924 #9950
* [BUGFIX] TSDB: Fix queries after a failed snapshot replay. #9980
## 2.31.2 / 2021-12-09
* [BUGFIX] TSDB: Fix queries after a failed snapshot replay. #9980
## 2.31.1 / 2021-11-05
* [BUGFIX] SD: Fix a panic when the experimental discovery manager receives
@ -66,6 +70,10 @@ Learn more about the Prometheus Agent in our [blog post](https://prometheus.io/b
* [BUGFIX] TSDB: Fix memory leak in samples deletion. #9151
* [BUGFIX] UI: Use consistent margin-bottom for all alert kinds. #9318
## 2.30.4 / 2021-12-09
* [BUGFIX] TSDB: Fix queries after a failed snapshot replay. #9980
## 2.30.3 / 2021-10-05
* [BUGFIX] TSDB: Fix panic on failed snapshot replay. #9438