grafana / mimir-prometheus

Apache License 2.0
35 stars 9 forks source link

merge upstream main at prometheus/prometheus@ee2b7fd #686

Closed krajorama closed 2 months ago

krajorama commented 2 months ago

Merge https://github.com/prometheus/prometheus/commit/ee2b7fdf9d4d4a7fa8d1d9eccae55e5dc802213c to main

Many conflicts: Conflicts:

CLAassistant commented 2 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.
9 out of 14 committers have signed the CLA.

:white_check_mark: aknuds1
:white_check_mark: roidelapluie
:white_check_mark: bboreham
:white_check_mark: pracucci
:white_check_mark: beorn7
:white_check_mark: dtrejod
:white_check_mark: krajorama
:white_check_mark: leizor
:white_check_mark: jcreixell
:x: fatsheep9146
:x: patilsuraj767
:x: NeerajGartia21
:x: machine424
:x: riskrole
You have signed the CLA already but the status is still pending? Let us recheck it.