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.11](backport #3591) [apm] Add docs on a known issue with APM Server + APM Java agent #3602

Merged
merged 2 commits into from
Feb 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 8, 2024

This is an automatic backport of pull request #3591 done by Mergify.
Cherry-pick of c151d92 has failed:

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

You are currently cherry-picking commit c151d928.
  (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:   docs/en/apm-server/agent-server-compatibility.asciidoc

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

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

* add known issue

* add footnote to apm compatibility matrix

* address feedback from @simitt

* address feedback from @bmorelli25

* Update docs/en/observability/apm/known-issues.asciidoc

Co-authored-by: Silvia Mitter <silvia.mitter@elastic.co>

---------

Co-authored-by: Silvia Mitter <silvia.mitter@elastic.co>
(cherry picked from commit c151d92)

# Conflicts:
#	docs/en/apm-server/known-issues.asciidoc
@mergify mergify bot requested a review from a team as a code owner February 8, 2024 17:10
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 8, 2024
Copy link
Contributor

github-actions bot commented Feb 8, 2024

A documentation preview will be available soon:

@colleenmcginnis colleenmcginnis removed the conflicts There is a conflict in the backported pull request label Feb 8, 2024
@colleenmcginnis colleenmcginnis merged commit 4b310d7 into 8.11 Feb 9, 2024
3 checks passed
@colleenmcginnis colleenmcginnis deleted the mergify/bp/8.11/pr-3591 branch February 9, 2024 02:11
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