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.17](backport #40036) mod: update github.com/hashicorp/go-retryablehttp to v0.7.7 #40041

Merged
merged 2 commits into from
Jun 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 27, 2024

GHSA-v6v8-xj6m-xwqh

Proposed commit message

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #40036 done by [Mergify](https://mergify.com).

GHSA-v6v8-xj6m-xwqh
(cherry picked from commit e1641ce)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner June 27, 2024 14:13
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 27, 2024
@mergify mergify bot requested review from AndersonQ and leehinman and removed request for a team June 27, 2024 14:13
Copy link
Contributor Author

mergify bot commented Jun 27, 2024

Cherry-pick of e1641ce has failed:

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

You are currently cherry-picking commit e1641ce577.
  (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:   CHANGELOG.next.asciidoc

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

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

@mergify mergify bot assigned efd6 Jun 27, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 27, 2024
@botelastic
Copy link

botelastic bot commented Jun 27, 2024

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

@efd6 efd6 force-pushed the mergify/bp/7.17/pr-40036 branch from 0521ad4 to 85ced63 Compare June 27, 2024 22:57
@efd6 efd6 force-pushed the mergify/bp/7.17/pr-40036 branch from 85ced63 to 7439c58 Compare June 27, 2024 22:58
@efd6
Copy link
Contributor

efd6 commented Jun 27, 2024

check-docs check failing with

>> check: Checking source code for common problems
Error: some files are not up-to-date. Run 'mage fmt update' then review and commit the changes. Modified: [x-pack/elastic-agent/pkg/agent/control/cproto/control.pb.go x-pack/elastic-agent/pkg/agent/control/cproto/control_grpc.pb.go]

This is generated code and so should be ignored.

@efd6 efd6 merged commit d2f40a7 into 7.17 Jun 28, 2024
111 of 112 checks passed
@efd6 efd6 deleted the mergify/bp/7.17/pr-40036 branch June 28, 2024 00:13
oakrizan pushed a commit to oakrizan/beats that referenced this pull request Jul 9, 2024
…tryablehttp to v0.7.7 (elastic#40041)

* mod: update github.com/hashicorp/go-retryablehttp to v0.7.7 (elastic#40036)

GHSA-v6v8-xj6m-xwqh
(cherry picked from commit e1641ce)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum

* resolve conflicts

---------

Co-authored-by: Dan Kortschak <[email protected]>
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.

1 participant