grafana / mimir-prometheus

Apache License 2.0
35 stars 9 forks source link

Merge upstream prometheus/prometheus at `b03b895` #662

Closed gotjosh closed 3 months ago

gotjosh commented 3 months ago

Note to reviewers:

Please pay close attention to this diff, in particular to the following files:

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
        deleted by us:   .github/workflows/ci.yml
        both modified:   go.mod
        both modified:   go.sum
        both modified:   storage/remote/write_handler.go

Relevant

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 7 committers have signed the CLA.

:white_check_mark: bboreham
:white_check_mark: aknuds1
:white_check_mark: beorn7
:white_check_mark: gotjosh
:x: jan--f
:x: SeanKilleen
:x: bwplotka
You have signed the CLA already but the status is still pending? Let us recheck it.