Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2023

This is an automatic backport of pull request #2919 done by Mergify.
Cherry-pick of e4bdc55 has failed:

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

You are currently cherry-picking commit e4bdc55.
  (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:
	new file:   docs/detections/prebuilt-rules/downloadable-packages/8-3-4/prebuilt-rule-8-3-4-exchange-mailbox-export-via-powershell.asciidoc
	new file:   docs/detections/prebuilt-rules/downloadable-packages/8-3-4/prebuilt-rule-8-3-4-exporting-exchange-mailbox-via-powershell.asciidoc
	new file:   docs/detections/prebuilt-rules/downloadable-packages/8-3-4/prebuilt-rule-8-3-4-multiple-alerts-in-different-att-ck-tactics-on-a-single-host.asciidoc
	new file:   docs/detections/prebuilt-rules/downloadable-packages/8-3-4/prebuilt-rule-8-3-4-multiple-alerts-involving-a-user.asciidoc
	new file:   docs/detections/prebuilt-rules/downloadable-packages/8-3-4/prebuilt-rule-8-3-4-suspicious-werfault-child-process.asciidoc
	new file:   docs/detections/prebuilt-rules/downloadable-packages/8-3-4/prebuilt-rules-8-3-4-appendix.asciidoc
	new file:   docs/detections/prebuilt-rules/downloadable-packages/8-3-4/prebuilt-rules-8-3-4-summary.asciidoc
	modified:   docs/index.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/detections/prebuilt-rules/prebuilt-rules-downloadable-updates.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…on Release (#2919)

* Adding docs for v8.3.4 prebuilt rules package

* adjusted verbiage in downloadable updates to kick CI testing

* attempting to restart CI testing by adjusting update language

(cherry picked from commit e4bdc55)

# Conflicts:
#	docs/detections/prebuilt-rules/prebuilt-rules-downloadable-updates.asciidoc
@github-actions
Copy link

Documentation previews:

@terrancedejesus
Copy link
Contributor

Conflicts are expected, related to broken links for 8.4 packages since these changes backported from main. See more details here.

@terrancedejesus terrancedejesus merged commit dc94894 into 8.3 Jan 24, 2023
@mergify mergify bot deleted the mergify/bp/8.3/pr-2919 branch January 24, 2023 23:00
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.

1 participant