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 #3997) fix: replace ndjson.org with ndjson spec #4000

Merged
merged 2 commits into from
Jun 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 12, 2024

the original website expired and it's currently serving malicious content.

Closes #3981


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

the original website expired and it's currently serving malicious content.

(cherry picked from commit 698d4e0)

# Conflicts:
#	docs/en/serverless/apm/apm-server-api/api-events.mdx
@mergify mergify bot requested a review from a team as a code owner June 12, 2024 19:06
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 12, 2024
Copy link
Contributor Author

mergify bot commented Jun 12, 2024

Cherry-pick of 698d4e0 has failed:

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

You are currently cherry-picking commit 698d4e00.
  (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/api-events.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/en/serverless/apm/apm-server-api/api-events.mdx

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.

Copy link
Contributor Author

mergify bot commented Jun 17, 2024

This pull request has not been merged yet. Could you please review and merge it @kruskall? 🙏

@bmorelli25 bmorelli25 enabled auto-merge (squash) June 17, 2024 13:17
@bmorelli25 bmorelli25 removed the conflicts There is a conflict in the backported pull request label Jun 17, 2024
@bmorelli25 bmorelli25 merged commit 2105c95 into 8.11 Jun 17, 2024
3 checks passed
@bmorelli25 bmorelli25 deleted the mergify/bp/8.11/pr-3997 branch June 17, 2024 13:44
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.

2 participants