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.6](backport #33988) Disable lockfile under fleet mode #34091

Merged
merged 2 commits into from Dec 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2022

This is an automatic backport of pull request #33988 done by Mergify.
Cherry-pick of 493b3a4 has failed:

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

You are currently cherry-picking commit 493b3a4634.
  (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:   libbeat/cmd/instance/beat.go

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

* diable lockfile under fleet mode

* update docs

* add changelog

(cherry picked from commit 493b3a4)

# Conflicts:
#	libbeat/cmd/instance/beat.go
@mergify mergify bot requested a review from a team as a code owner December 21, 2022 18:19
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 21, 2022
@mergify mergify bot requested review from rdner and cmacknz and removed request for a team December 21, 2022 18:19
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 21, 2022
@cmacknz cmacknz added the Team:Elastic-Agent Label for the Agent team label Dec 21, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 21, 2022
@sonarcloud
Copy link

sonarcloud bot commented Dec 21, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 21, 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

  • Start Time: 2022-12-21T18:24:51.818+0000

  • Duration: 77 min 26 sec

Test stats 🧪

Test Results
Failed 0
Passed 25051
Skipped 1951
Total 27002

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

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

@cmacknz cmacknz merged commit 4ab58f8 into 8.6 Dec 21, 2022
@cmacknz cmacknz deleted the mergify/bp/8.6/pr-33988 branch December 21, 2022 20:12
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 Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants