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

chore: upgrade tailing sidecar #3719

Merged
merged 1 commit into from
May 22, 2024
Merged

Conversation

rnishtala-sumo
Copy link
Contributor

@rnishtala-sumo rnishtala-sumo commented May 22, 2024

chore: upgrade tailing sidecar

Checklist

  • Changelog updated or skip changelog label added
  • Documentation updated

@rnishtala-sumo rnishtala-sumo requested a review from a team as a code owner May 22, 2024 17:07
@github-actions github-actions bot added the documentation documentation label May 22, 2024
@rnishtala-sumo rnishtala-sumo merged commit 19bc5d8 into release-v3.19 May 22, 2024
42 checks passed
@rnishtala-sumo rnishtala-sumo deleted the update-tailing-sidecar branch May 22, 2024 17:17
@sumo-backporter
Copy link
Contributor

The backport to main 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 working tree
git worktree add .worktrees/backport-main main
# Navigate to the new working tree
cd .worktrees/backport-main
# Create a new branch
git switch --create backport-3719-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 19bc5d88e0e10215c3a0d85bb07b7dc2e63433d1
# Push it to GitHub
git push --set-upstream origin backport-3719-to-main
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-main

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

rnishtala-sumo added a commit that referenced this pull request May 22, 2024
rnishtala-sumo added a commit that referenced this pull request May 22, 2024
rnishtala-sumo added a commit that referenced this pull request May 22, 2024
rnishtala-sumo added a commit that referenced this pull request May 22, 2024
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