Skip to content

Conversation

@Mpdreamz
Copy link
Member

@Mpdreamz Mpdreamz commented Oct 2, 2020

No description provided.

@Mpdreamz
Copy link
Member Author

Mpdreamz commented Oct 2, 2020

Integration tests still failing, unrelated new changes from the head of Elasticsearch master branch that needs to be tackled.

Opened #5044 to address those.

@Mpdreamz Mpdreamz merged commit 54abc92 into master Oct 2, 2020
@Mpdreamz Mpdreamz deleted the feature/master/move-to-nullean-test-logger branch October 2, 2020 20:46
@github-actions
Copy link
Contributor

github-actions bot commented Oct 2, 2020

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

Then, create a pull request where the base branch is 7.x and the compare/head branch is backport-5044-to-7.x.

Mpdreamz added a commit that referenced this pull request Oct 3, 2020
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