Skip to content

Conversation

stevejgordon
Copy link
Contributor

@stevejgordon stevejgordon commented Feb 25, 2021

Contributes to #5337

Copy link
Member

@Mpdreamz Mpdreamz left a comment

Choose a reason for hiding this comment

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

LGTM

@stevejgordon stevejgordon merged commit 2dbaf16 into 7.12 Mar 1, 2021
@stevejgordon stevejgordon deleted the feature/rollover-max_primary_shard_size branch March 1, 2021 06:10
@github-actions
Copy link
Contributor

github-actions bot commented Mar 1, 2021

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

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

stevejgordon added a commit that referenced this pull request Mar 1, 2021
stevejgordon added a commit that referenced this pull request Mar 1, 2021
Co-authored-by: Steve Gordon <sgordon@hotmail.co.uk>
stevejgordon added a commit that referenced this pull request Mar 1, 2021
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.

2 participants