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.14](backport #26514) Enroll proxy settings #26735

Merged
merged 2 commits into from
Jul 6, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 6, 2021

This is an automatic backport of pull request #26514 done by Mergify.
Cherry-pick of 26325b0 has failed:

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

You are currently cherry-picking commit 26325b01d.
  (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:   x-pack/elastic-agent/CHANGELOG.next.asciidoc
	modified:   x-pack/elastic-agent/pkg/agent/cmd/enroll.go
	modified:   x-pack/elastic-agent/pkg/agent/configuration/fleet_server.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go

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/

(cherry picked from commit 26325b0)

# Conflicts:
#	x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 6, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 6, 2021
@mergify mergify bot mentioned this pull request Jul 6, 2021
2 tasks
@botelastic
Copy link

botelastic bot commented Jul 6, 2021

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 6, 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #26735 updated

  • Start Time: 2021-07-06T12:48:12.506+0000

  • Duration: 73 min 7 sec

  • Commit: 5ddc92f

Test stats 🧪

Test Results
Failed 0
Passed 6924
Skipped 24
Total 6948

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 6924
Skipped 24
Total 6948

@urso urso self-assigned this Jul 6, 2021
@urso urso changed the title Enroll proxy settings (backport #26514) [7.14](backport #26514) Enroll proxy settings Jul 6, 2021
@urso urso merged commit 70218bc into 7.14 Jul 6, 2021
@urso urso deleted the mergify/bp/7.14/pr-26514 branch July 6, 2021 14:50
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants