Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 2, 2024

Resolves #3433, which is a duplicate of #3535.

This PR adds the Allowlist Elastic Endpoint in third-party antivirus apps page to serverless docs and a disambiguation note to the Trusted applications page.

Previews:


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

… serverless docs (#5639)

* Adds Allowlist Elastic Endpoint in third-party antivirus apps page to serverless docs

* Adds page description

* Apply suggestions from code review

Co-authored-by: Joe Peeples <joe.peeples@elastic.co>

* Removes div id

* Adds note to allowlist pages

---------

Co-authored-by: Joe Peeples <joe.peeples@elastic.co>
(cherry picked from commit f8e7ca6)

# Conflicts:
#	docs/serverless/edr-manage/trusted-apps-ov.mdx
#	docs/serverless/serverless-security.docnav.json
@mergify
Copy link
Contributor Author

mergify bot commented Aug 2, 2024

Cherry-pick of f8e7ca6 has failed:

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

You are currently cherry-picking commit f8e7ca6e.
  (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/management/admin/allowlist-endpoint-3rd-party-av.asciidoc
	modified:   docs/management/admin/trusted-apps.asciidoc
	new file:   docs/serverless/edr-manage/allowlist-endpoint-3rd-party-av.mdx

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/serverless/edr-manage/trusted-apps-ov.mdx
	deleted by us:   docs/serverless/serverless-security.docnav.json

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

github-actions bot commented Aug 2, 2024

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.

@natasha-moore-elastic natasha-moore-elastic merged commit eae9f0a into 8.7 Aug 2, 2024
@mergify mergify bot deleted the mergify/bp/8.7/pr-5639 branch August 2, 2024 15:41
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