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.8](backport #3554) Remove unused APM attributes #3563

Merged
merged 3 commits into from
Jan 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 22, 2024

This is an automatic backport of pull request #3554 done by Mergify.
Cherry-pick of 094640e has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/apm-server/version.asciidoc
	both modified:   docs/en/observability/apm.asciidoc

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit 094640e)

# Conflicts:
#	docs/en/apm-server/version.asciidoc
#	docs/en/observability/apm.asciidoc
@mergify mergify bot requested a review from a team as a code owner January 22, 2024 23:44
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 22, 2024
Copy link
Contributor

A documentation preview will be available soon:

@bmorelli25 bmorelli25 removed the conflicts There is a conflict in the backported pull request label Jan 22, 2024
@bmorelli25 bmorelli25 merged commit 4cbcd17 into 8.8 Jan 23, 2024
3 of 4 checks passed
@bmorelli25 bmorelli25 deleted the mergify/bp/8.8/pr-3554 branch January 23, 2024 00:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant