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 4.8.0 into 4.9.0 #664

Merged
merged 25 commits into from
Apr 30, 2024
Merged

Merge 4.8.0 into 4.9.0 #664

Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cfc4a51
Bumped revision to 40807
davidcr01 Apr 5, 2024
c973590
Merge pull request #636 from wazuh/bump-revision-40807
davidcr01 Apr 5, 2024
aa03c8f
Bumped version to 4.7.4
davidcr01 Apr 18, 2024
f0bbf20
Merge pull request #643 from wazuh/bump-version-4.7.4
teddytpc1 Apr 18, 2024
03a4ebd
bump revision number
vcerenu Apr 19, 2024
c4bc62c
Merge pull request #646 from wazuh/bump-revision
vcerenu Apr 19, 2024
ef507ca
add beta6 tag
vcerenu Apr 19, 2024
2f8767e
Merge pull request #647 from wazuh/beta6-tag
vcerenu Apr 19, 2024
09ac1cc
revert beta6 changes
vcerenu Apr 19, 2024
d3961e2
Merge pull request #648 from wazuh/revert-beta6
vcerenu Apr 19, 2024
f930d31
Bumped revision to 40716
davidcr01 Apr 23, 2024
993bd16
Merge pull request #650 from wazuh/bump-revision-40716
davidcr01 Apr 23, 2024
b426cd8
Updated tag for 4.7.4 RC1
davidcr01 Apr 23, 2024
27bfe9a
Merge pull request #651 from wazuh/change-tag-4.7.4-rc1
davidcr01 Apr 23, 2024
7571307
Reverted tag for 4.7.4 RC1
davidcr01 Apr 23, 2024
2749f28
Merge pull request #652 from wazuh/revert-tag-4.7.4-rc1
davidcr01 Apr 23, 2024
59a4cc2
bump revision
vcerenu Apr 25, 2024
174ded7
Merge pull request #655 from wazuh/bump-revision-474
vcerenu Apr 25, 2024
1d103de
change image version
vcerenu Apr 25, 2024
6b2c479
Merge pull request #656 from wazuh/change-image-rc2
davidcr01 Apr 25, 2024
1e3b0cd
rollback image name
vcerenu Apr 25, 2024
34de54f
Merge pull request #657 from wazuh/rollback-image-version
davidcr01 Apr 25, 2024
815c748
resolving conflicts
vcerenu Apr 30, 2024
d1c1f6a
Merge pull request #663 from wazuh/merge-4.7.4-into-4.8.0
vcerenu Apr 30, 2024
7fe4b89
resolving conflicts
vcerenu Apr 30, 2024
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ All notable changes to this project will be documented in this file.

- Update to Wazuh version [4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480)

## [4.7.4]

### Added

- Update to Wazuh version [4.7.4](https://github.com/wazuh/wazuh/blob/v4.7.4/CHANGELOG.md#v474)

## [4.7.3]

### Added
Expand Down