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

[8.0] update beats: fix new file location (backport #6700) #7183

Merged
merged 2 commits into from
Feb 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2022

This is an automatic backport of pull request #6700 done by Mergify.
Cherry-pick of ea46964 has failed:

On branch mergify/bp/8.0/pr-6700
Your branch is up to date with 'origin/8.0'.

You are currently cherry-picking commit ea46964f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/scripts/update-beats.sh

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit ea46964)

# Conflicts:
#	.ci/scripts/update-beats.sh
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 2, 2022
@mergify mergify bot assigned v1v Feb 2, 2022
@apmmachine
Copy link
Contributor

apmmachine commented Feb 2, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Reason: null

  • Start Time: 2022-02-02T13:00:34.241+0000

  • Duration: 63 min 14 sec

  • Commit: 4a2032b

Test stats 🧪

Test Results
Failed 0
Passed 5625
Skipped 20
Total 5645

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor Author

mergify bot commented Feb 2, 2022

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.0/pr-6700 upstream/mergify/bp/8.0/pr-6700
git merge upstream/8.0
git push upstream mergify/bp/8.0/pr-6700

@simitt simitt merged commit 61ef5a2 into 8.0 Feb 2, 2022
@simitt simitt deleted the mergify/bp/8.0/pr-6700 branch February 2, 2022 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants