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.16](backport #4463) Clean up new APM known issue #4466

Merged
merged 2 commits into from
Nov 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 31, 2024

Description

Removes a rogue +.

Documentation sets edited in this PR

Check all that apply.

  • Stateful (docs/en/observability/*)
  • Serverless (docs/en/serverless/*)
  • Integrations Developer Guide (docs/en/integrations/*)
  • None of the above

Related issue

N/A

Checklist

  • Product/Engineering Review
  • Writer Review

Follow-up tasks

Select one.

  • This PR does not need to be ported to another doc set because:
    • The concepts in this PR only apply to one doc set (serverless or stateful)
    • The PR contains edits to both doc sets (serverless and stateful)
  • This PR needs to be ported to another doc set:
    • Port to stateful docs: <link to PR or tracking issue>
    • Port to serverless docs: <link to PR or tracking issue>

This is an automatic backport of pull request #4463 done by [Mergify](https://mergify.com).

* clean up

* further clarifications

---------

Co-authored-by: Francesco Gualazzi <[email protected]>
(cherry picked from commit c7cb6c1)

# Conflicts:
#	docs/en/observability/apm/known-issues.asciidoc
@mergify mergify bot requested a review from a team as a code owner October 31, 2024 16:00
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 31, 2024
Copy link
Contributor Author

mergify bot commented Oct 31, 2024

Cherry-pick of c7cb6c1 has failed:

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

You are currently cherry-picking commit c7cb6c15.
  (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/observability/apm/known-issues.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

Copy link
Contributor

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@colleenmcginnis colleenmcginnis requested review from colleenmcginnis and removed request for a team November 1, 2024 00:53
@colleenmcginnis colleenmcginnis changed the base branch from 8.16 to mergify/bp/8.16/pr-4459 November 1, 2024 14:15
Copy link
Contributor Author

mergify bot commented Nov 1, 2024

This pull request is now in conflict. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.16/pr-4463 upstream/mergify/bp/8.16/pr-4463
git merge upstream/mergify/bp/8.16/pr-4459
git push upstream mergify/bp/8.16/pr-4463

@colleenmcginnis colleenmcginnis merged commit e3672aa into mergify/bp/8.16/pr-4459 Nov 1, 2024
2 of 3 checks passed
@colleenmcginnis colleenmcginnis deleted the mergify/bp/8.16/pr-4463 branch November 1, 2024 14:24
colleenmcginnis added a commit that referenced this pull request Nov 1, 2024
* APM: add known issue of lazy rollover bug (#4459)

Signed-off-by: inge4pres <[email protected]>
Co-authored-by: simitt <[email protected]>
(cherry picked from commit 66a73ef)

* Clean up new APM known issue (#4463) (#4466)

* clean up

* further clarifications

---------

Co-authored-by: Francesco Gualazzi <[email protected]>
(cherry picked from commit c7cb6c1)

# Conflicts:
#	docs/en/observability/apm/known-issues.asciidoc

Co-authored-by: Colleen McGinnis <[email protected]>

---------

Co-authored-by: Francesco Gualazzi <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Colleen McGinnis <[email protected]>
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.

1 participant