Skip to content

Update specifications #4552

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 1 commit into from
Apr 3, 2020
Merged

Update specifications #4552

merged 1 commit into from
Apr 3, 2020

Conversation

codebrain
Copy link
Contributor

Incorporates change: elastic/elasticsearch#54438

Following merge, #4526 will nee updating.

@codebrain codebrain merged commit d25be13 into 7.7 Apr 3, 2020
@codebrain codebrain deleted the feature/7.7/update-specs-20200403 branch April 3, 2020 07:15
github-actions bot pushed a commit that referenced this pull request Apr 3, 2020
@github-actions
Copy link
Contributor

github-actions bot commented Apr 3, 2020

The backport to master failed:

The process '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-4552-to-master
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d25be1376ea3b347fa702d1c7dca59ea308df7ff
# Push it to GitHub
git push --set-upstream origin backport-4552-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-4552-to-master.

codebrain added a commit that referenced this pull request Apr 3, 2020
Co-authored-by: Stuart Cam <stuart.cam@elastic.co>
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.

1 participant