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.

Sign up for GitHub

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

Jump to bottom

Merge branch 4.5.0 into 4.5.1 #6263

Merged
merged 15 commits into from
Jul 21, 2023
Merged

Merge branch 4.5.0 into 4.5.1 #6263

merged 15 commits into from
Jul 21, 2023

Conversation

s-ocando
Copy link
Contributor

Description

Merge branch 4.5.0 into 4.5.1. Related issue: #6261

Checks

  • Compiles without warnings.
  • Uses present tense, active voice, and semi-formal registry.
  • Uses short, simple sentences.
  • Uses bold for user interface elements, italics for key terms or emphasis, and code font for Bash commands, file names, REST paths, and code.
  • Uses three spaces indentation.
  • Adds or updates meta descriptions accordingly.
  • Updates the redirects.js script if necessary (check this guide).

javimed and others added 15 commits July 4, 2023 17:57
@javimed
{ẂiP} Move cloud security sources
628f796
@javimed
{WiP} Move cloud security sources
986f3d1
@javimed
{WiP} Move cloud security sources
8aa8025
@javimed
Undo orphan content removal
0f5042c
@javimed
Fix Wazuh indexer backup folder reference
50e5bb4
@javimed
Fix Wazuh indexer backup folder reference
1c81bd7
@vamera
Fixed a javacript error occurring while managing relative paths on th…
cb57ec3 
…e pages
@s-ocando
Merge pull request #6242 from wazuh/4.4-fix-relative-url
721ad14 
[4.4] Fixed an error occurring while managing relative paths
@s-ocando
Merge pull request #6237 from wazuh/fix-securityconfig-backup-reference
9e34da4 
Fix Wazuh indexer backup folder reference
@javimed @s-ocando
Update source/_static/js/redirects.js
e3f450d 
Co-authored-by: Sandra Ocando <[email protected]>
@s-ocando
Merge pull request #6209 from wazuh/organize-cloud-source-files
0186286 
Organize cloud security sources
@javimed
Add ossec.conf references
5b9a1b9
@javimed @s-ocando
Apply suggestions from code review
ffa69a4 
Co-authored-by: Sandra Ocando <[email protected]>
@s-ocando
Merge pull request #6249 from wazuh/6248-clarify-manager-configuration
2a01083 
Add ossec.conf references
@javimed
Merge pull request #6262 from wazuh/merge-4.4-into-4.5.0
999df8f 
Merge branch 4.4 into 4.5.0
@s-ocando s-ocando requested a review from javimed July 21, 2023 11:41
@javimed javimed linked an issue Jul 21, 2023 that may be closed by this pull request
Scheduled upward merges for numbered branches in wazuh-documentation repository - Fortnight #14 #6261
Closed
5 tasks
javimed
javimed approved these changes Jul 21, 2023
View reviewed changes
Copy link
Member

@javimed javimed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@javimed javimed merged commit 9687e2f into 4.5.1 Jul 21, 2023
@javimed javimed deleted the merge-4.5.0-into-4.5.1 branch July 21, 2023 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@javimed javimed javimed approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Scheduled upward merges for numbered branches in wazuh-documentation repository - Fortnight #14
3 participants
@s-ocando @javimed @vamera