8000 Upgrade to dskit@f84dc58e0bd9 by aknuds1 · Pull Request #11549 · grafana/mimir · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Upgrade to dskit@f84dc58e0bd9 #11549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 27, 2025
Merged

Upgrade to dskit@f84dc58e0bd9 #11549

merged 2 commits into from
May 27, 2025

Conversation

aknuds1
Copy link
Contributor
@aknuds1 aknuds1 commented May 27, 2025

What this PR does

Upgrade to dskit@f84dc58e0bd9. Includes one fix: grafana/dskit#698.

Which issue(s) this PR fixes or relates to

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
@aknuds1 aknuds1 force-pushed the arve/upgrade-dskit branch from 76f2933 to eb2f341 Compare May 27, 2025 07:02
@aknuds1 aknuds1 marked this pull request as ready for review May 27, 2025 07:02
@aknuds1 aknuds1 requested review from stevesg and a team as code owners May 27, 2025 07:02
@aknuds1 aknuds1 added the bug Something isn't working label May 27, 2025
@aknuds1 aknuds1 requested a review from colega May 27, 2025 07:15
@aknuds1 aknuds1 enabled auto-merge (squash) May 27, 2025 07:19
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
@aknuds1 aknuds1 disabled auto-merge May 27, 2025 07:29
@aknuds1 aknuds1 enabled auto-merge (squash) May 27, 2025 07:29
@aknuds1 aknuds1 merged commit 351392c into main May 27, 2025
30 checks passed
@aknuds1 aknuds1 deleted the arve/upgrade-dskit branch May 27, 2025 07:55
@mimir-github-bot
Copy link
Contributor

The backport to r343 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-11549-to-r343 origin/r343
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 351392c22e5f2bfc94c761ae11d922aeba1db263
# Push it to GitHub
git push --set-upstream origin backport-11549-to-r343
git switch main
# Remove the local backport branch
git branch -D backport-11549-to-r343

Then, create a pull request where the base branch is r343 and the compare/head branch is backport-11549-to-r343.

@mimir-github-bot
Copy link
Contributor

The backport to r340 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-11549-to-r340 origin/r340
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 351392c22e5f2bfc94c761ae11d922aeba1db263
# Push it to GitHub
git push --set-upstream origin backport-11549-to-r340
git switch main
# Remove the local backport branch
git branch -D backport-11549-to-r340

Then, create a pull request where the base branch is r340 and the compare/head branch is backport-11549-to-r340.

@mimir-github-bot
Copy link
Contributor

The backport to r338 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-11549-to-r338 origin/r338
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 351392c22e5f2bfc94c761ae11d922aeba1db263
# Push it to GitHub
git push --set-upstream origin backport-11549-to-r338
git switch main
# Remove the local backport branch
git branch -D backport-11549-to-r338

Then, create a pull request where the base branch is r338 and the compare/head branch is backport-11549-to-r338.

@mimir-github-bot
Copy link
Contributor

The backport to r344 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-11549-to-r344 origin/r344
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 351392c22e5f2bfc94c761ae11d922aeba1db263
# Push it to GitHub
git push --set-upstream origin backport-11549-to-r344
git switch main
# Remove the local backport branch
git branch -D backport-11549-to-r344

Then, create a pull request where the base branch is r344 and the compare/head branch is backport-11549-to-r344.

@mimir-github-bot
Copy link
Contributor

The backport to r339 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-11549-to-r339 origin/r339
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 351392c22e5f2bfc94c761ae11d922aeba1db263
# Push it to GitHub
git push --set-upstream origin backport-11549-to-r339
git switch main
# Remove the local backport branch
git branch -D backport-11549-to-r339

Then, create a pull request where the base branch is r339 and the compare/head branch is backport-11549-to-r339.

@mimir-github-bot
Copy link
Contributor

The backport to r341 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-11549-to-r341 origin/r341
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 351392c22e5f2bfc94c761ae11d922aeba1db263
# Push it to GitHub
git push --set-upstream origin backport-11549-to-r341
git switch main
# Remove the local backport branch
git branch -D backport-11549-to-r341

Then, create a pull request where the base branch is r341 and the compare/head branch is backport-11549-to-r341.

aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@75997b78a77d

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@f84dc58e0bd9

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@990377cd86a1

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@f84dc58e0bd9

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@46927ab43572

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@18b79c4e9e07

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@4976ce2fd93c

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@f84dc58e0bd9

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@74569ccb2f6b

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@26335405716d

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@105e62cba78d

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@74569ccb2f6b

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@26335405716d

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@105e62cba78d

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@18b79c4e9e07

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@4976ce2fd93c

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@f84dc58e0bd9

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 351392c)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@74569ccb2f6b

---------


(cherry picked from commit 351392c)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@26335405716d

---------


(cherry picked from commit 351392c)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@18b79c4e9e07

---------


(cherry picked from commit 351392c)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@f84dc58e0bd9

---------


(cherry picked from commit 351392c)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@4976ce2fd93c

---------


(cherry picked from commit 351392c)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request May 27, 2025
* Upgrade to dskit@105e62cba78d

---------


(cherry picked from commit 351392c)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0