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

Merge 4.4 into 4.5.0 #884

Merged
merged 9 commits into from
Jul 11, 2023
Merged

Merge 4.4 into 4.5.0 #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
77725b7
Revision bump
teddytpc1 Jun 12, 2023
d278782
Merge pull request #858 from wazuh/merge-4-4-4-to-4-4
teddytpc1 Jun 13, 2023
75f9230
Merge pull request #877 from wazuh/merge-4.4.4-into-4.4
teddytpc1 Jul 7, 2023
55ee49a
Bumped to 4.4.5
teddytpc1 Jul 7, 2023
ff1e5f9
Merge pull request #878 from wazuh/bump-4.4.5
teddytpc1 Jul 7, 2023
a433989
bump revision
vcerenu Jul 10, 2023
ce8dd29
Merge pull request #879 from wazuh/4.4.5-bump-revision
c-bordon Jul 10, 2023
a953326
Merge pull request #883 from wazuh/merge-4.4.5-into-4.4
vcerenu Jul 11, 2023
0f65448
resolving merge conflicts
vcerenu Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file.

- Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)

## Wazuh Docker v4.4.5
### Added

- Update Wazuh to version [4.4.5](https://github.com/wazuh/wazuh/blob/v4.4.5/CHANGELOG.md#v445)

## Wazuh Docker v4.4.4
### Added

Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.5.0 | | |
| v4.4.5 | | |
| v4.4.4 | | |
| v4.4.3 | | |
| v4.4.2 | | |
Expand Down