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

Bump fluentd image to 1.12.0-sumo-4 #1510

Merged
merged 1 commit into from Mar 22, 2021
Merged

Conversation

pmalek-sumo
Copy link
Contributor

@perk-sumo perk-sumo merged commit 78124e4 into main Mar 22, 2021
@perk-sumo perk-sumo deleted the bump-fluentd-to-v1.12.0-sumo-4 branch March 22, 2021 15:51
@sumo-backporter
Copy link
Contributor

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

Then, create a pull request where the base branch is release-v2.0 and the compare/head branch is backport-1510-to-release-v2.0.

@perk-sumo
Copy link
Contributor

I backported this by hand: #1511

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants