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

[7.x](backport #26406) Update dependent package to avoid downloading a suspicious file #26672

Merged
merged 3 commits into from
Jul 28, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2021

This is an automatic backport of pull request #26406 done by Mergify.
Cherry-pick of 127e3c6 has failed:

On branch mergify/bp/7.x/pr-26406
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 127e3c6f7.
  (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)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

* update to avoid downloading a suspicious file

* Update notice

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
(cherry picked from commit 127e3c6)

# Conflicts:
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 1, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 1, 2021
@botelastic
Copy link

botelastic bot commented Jul 1, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 1, 2021

💚 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

  • Start Time: 2021-07-28T14:43:16.343+0000

  • Duration: 214 min 33 sec

  • Commit: 4f71075

Test stats 🧪

Test Results
Failed 0
Passed 48990
Skipped 5233
Total 54223

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 48990
Skipped 5233
Total 54223

@kaiyan-sheng
Copy link
Contributor

@blakerouse Seems like there is a merge conflict here. Could you resolve it and merge this backport please? TIA!!

@blakerouse blakerouse merged commit e4812ec into 7.x Jul 28, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-26406 branch July 28, 2021 22:49
@mergify
Copy link
Contributor Author

mergify bot commented Oct 27, 2021

This pull request is now in conflicts. Could you fix it? 🙏
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/7.x/pr-26406 upstream/mergify/bp/7.x/pr-26406
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-26406

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants