Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 12, 2024

Fixes #5814 for both stateful and serverless.

Previews

(cherry picked from commit 671a78c)

# Conflicts:
#	docs/serverless/edr-install-config/configure-endpoint-integration-policy.asciidoc
@mergify mergify bot requested a review from a team as a code owner November 12, 2024 18:08
@mergify
Copy link
Contributor Author

mergify bot commented Nov 12, 2024

Cherry-pick of 671a78c has failed:

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

You are currently cherry-picking commit 671a78c1.
  (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/getting-started/configure-integration-policy.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/serverless/edr-install-config/configure-endpoint-integration-policy.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

@github-actions
Copy link

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.

@joepeeples joepeeples enabled auto-merge (squash) November 12, 2024 18:11
@joepeeples joepeeples merged commit 0c9583d into 8.15 Nov 12, 2024
4 checks passed
@joepeeples joepeeples deleted the mergify/bp/8.15/pr-6135 branch November 12, 2024 19:29
acorretti pushed a commit that referenced this pull request Nov 19, 2024
…ort #6135) (#6143)

* Fixes typos (#6135)

(cherry picked from commit 8005fb1)

# Conflicts:
#	docs/serverless/edr-install-config/configure-endpoint-integration-policy.asciidoc

* Delete docs/serverless directory and its contents

---------

Co-authored-by: Joe Peeples <joe.peeples@elastic.co>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants