grafana / mimir-prometheus

Apache License 2.0
35 stars 9 forks source link

Sync upstream 20240710 #660

Closed zenador closed 3 months ago

zenador commented 3 months ago

This brings changes from prometheus/prometheus up to 2024-07-10 commit https://github.com/prometheus/prometheus/commit/b1c106a9ce091c923d56080dc94e996fff8cf40f

Only minor merge conflicts in:

CLAassistant commented 3 months ago

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 8 committers have signed the CLA.

:white_check_mark: bboreham
:white_check_mark: aknuds1
:white_check_mark: beorn7
:white_check_mark: zenador
:x: Maniktherana
:x: bwplotka
:x: fpetkovski
:x: juliusv
You have signed the CLA already but the status is still pending? Let us recheck it.