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 #28452) [Heartbeat] Update step name field to use keyword and text #28474

Merged
merged 2 commits into from
Oct 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 15, 2021

This is an automatic backport of pull request #28452 done by Mergify.
Cherry-pick of 539edc8 has failed:

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

You are currently cherry-picking commit 539edc8385.
  (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
	modified:   heartbeat/_meta/fields.common.yml
	modified:   heartbeat/docs/fields.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   heartbeat/include/fields.go
	both modified:   x-pack/heartbeat/include/fields.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.io/

* Update step name field to use keyword and text.

* Add CHANGELOG entry.

(cherry picked from commit 539edc8)

# Conflicts:
#	heartbeat/include/fields.go
#	x-pack/heartbeat/include/fields.go
@mergify mergify bot requested a review from a team as a code owner October 15, 2021 13:58
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 15, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 15, 2021
@botelastic
Copy link

botelastic bot commented Oct 15, 2021

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 15, 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-10-18T16:54:36.562+0000

  • Duration: 78 min 47 sec

  • Commit: 858d305

Test stats 🧪

Test Results
Failed 0
Passed 3553
Skipped 80
Total 3633

💚 Flaky test report

Tests succeeded.

🤖 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.

@justinkambic
Copy link
Contributor

/test

@justinkambic justinkambic merged commit 2414eaf into 7.x Oct 18, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-28452 branch October 18, 2021 19:16
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.

2 participants