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.7.5 into 4.8.0 #2961

Merged
merged 6 commits into from
May 22, 2024
Merged

Merge 4.7.5 into 4.8.0 #2961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c22a3c
build: bump version to 4.7.5
JcabreraC May 15, 2024
7304943
build: fix release date and modify source_branch
MarcelKemp May 15, 2024
857808b
Merge pull request #2950 from wazuh/maintenance/2949-bump-version-4.7.5
TomasTurina May 15, 2024
50bb879
Update dates for 4.7.5
TomasTurina May 22, 2024
0ff8b3a
Merge pull request #2960 from wazuh/2958_update_dates_4_7_5
TomasTurina May 22, 2024
ceb720e
Merge branch '4.7.5' into merge-4.7.5-into-4.8.0
TomasTurina May 22, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.0

## [4.7.5]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.5

## [4.7.4]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.4
Expand Down
2 changes: 2 additions & 0 deletions aix/SPECS/wazuh-agent-aix.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ rm -fr %{buildroot}
%changelog
* Thu May 16 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Mon May 27 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
6 changes: 6 additions & 0 deletions debs/SPECS/wazuh-agent/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low

-- Wazuh, Inc <[email protected]> Thu, 16 May 2024 00:00:00 +0000

wazuh-agent (4.7.5-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

-- Wazuh, Inc <[email protected]> Mon, 27 May 2024 00:00:00 +0000

wazuh-agent (4.7.4-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
Expand Down
6 changes: 6 additions & 0 deletions debs/SPECS/wazuh-manager/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low

-- Wazuh, Inc <[email protected]> Thu, 16 May 2024 00:00:00 +0000

wazuh-manager (4.7.5-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

-- Wazuh, Inc <[email protected]> Mon, 27 May 2024 00:00:00 +0000

wazuh-manager (4.7.4-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
Expand Down
2 changes: 2 additions & 0 deletions rpms/SPECS/wazuh-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,8 @@ rm -fr %{buildroot}
%changelog
* Thu May 16 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Mon May 27 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
2 changes: 2 additions & 0 deletions rpms/SPECS/wazuh-manager.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,8 @@ rm -fr %{buildroot}
%changelog
* Thu May 16 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Mon May 27 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
6 changes: 6 additions & 0 deletions stack/dashboard/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low

-- Wazuh, Inc <[email protected]> Thu, 16 May 2024 00:00:00 +0000

wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

-- Wazuh, Inc <[email protected]> Mon, 27 May 2024 00:00:00 +0000

wazuh-dashboard (4.7.4-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
Expand Down
2 changes: 2 additions & 0 deletions stack/dashboard/rpm/wazuh-dashboard.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ rm -fr %{buildroot}
%changelog
* Thu May 16 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Mon May 27 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
6 changes: 6 additions & 0 deletions stack/indexer/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low

-- Wazuh, Inc <[email protected]> Thu, 16 May 2024 00:00:00 +0000

wazuh-indexer (4.7.5-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

-- Wazuh, Inc <[email protected]> Mon, 27 May 2024 00:00:00 +0000

wazuh-indexer (4.7.4-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
Expand Down
2 changes: 2 additions & 0 deletions stack/indexer/rpm/wazuh-indexer.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,8 @@ rm -fr %{buildroot}
%changelog
* Thu May 16 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Mon May 27 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
Loading