Skip to content
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

Vendor dskit 8e7752e59bab #9594

Merged
merged 4 commits into from
Oct 11, 2024
Merged

Vendor dskit 8e7752e59bab #9594

merged 4 commits into from
Oct 11, 2024

Conversation

seizethedave
Copy link
Contributor

@seizethedave seizethedave commented Oct 11, 2024

What this PR does

Bumps dskit to latest; regenerate references. Includes dskit changes:

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.

@seizethedave seizethedave changed the title Vendor latest dskit Vendor latest dskit 8e7752e59bab Oct 11, 2024
@seizethedave seizethedave changed the title Vendor latest dskit 8e7752e59bab Vendor dskit 8e7752e59bab Oct 11, 2024
@seizethedave seizethedave marked this pull request as ready for review October 11, 2024 21:07
Copy link
Member

@julienduchesne julienduchesne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Memberlist WriteTo changes LGTM

@seizethedave seizethedave enabled auto-merge (squash) October 11, 2024 21:13
@seizethedave seizethedave merged commit ef3ece3 into main Oct 11, 2024
29 checks passed
@seizethedave seizethedave deleted the davidgrant/update-dskit branch October 11, 2024 21:38
@grafanabot
Copy link
Contributor

The backport to r311 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-9594-to-r311 origin/r311
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ef3ece3cd7008c4869667725432fc8950c36c9c7
# Push it to GitHub
git push --set-upstream origin backport-9594-to-r311
git switch main
# Remove the local backport branch
git branch -D backport-9594-to-r311

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

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.

4 participants