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 #3752) docs: remove false deprecation note for standalone apm-server #3767

Merged
merged 2 commits into from
Apr 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 15, 2024

Closes elastic/apm-server#12796


This is an automatic backport of pull request #3752 done by Mergify.

(cherry picked from commit 38f04c9)

# Conflicts:
#	docs/en/apm-server/upgrading-to-8.x.asciidoc
@mergify mergify bot requested a review from a team as a code owner April 15, 2024 16:31
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 15, 2024
Copy link
Contributor Author

mergify bot commented Apr 15, 2024

Cherry-pick of 38f04c9 has failed:

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

You are currently cherry-picking commit 38f04c90.
  (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/upgrading-to-8.x.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@bmorelli25 bmorelli25 enabled auto-merge (squash) April 15, 2024 16:51
@bmorelli25 bmorelli25 merged commit 326fbe6 into 8.6 Apr 15, 2024
3 checks passed
@bmorelli25 bmorelli25 deleted the mergify/bp/8.6/pr-3752 branch April 15, 2024 17:10
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants