Skip to content

Commit

Permalink
Merge pull request #2977 from wazuh/merge-4.7.5-into-4.8.0
Browse files Browse the repository at this point in the history
Merge 4.7.5 into 4.8.0
  • Loading branch information
vikman90 authored May 31, 2024
2 parents 8c02ef0 + b9a2523 commit aec4758
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions aix/SPECS/wazuh-agent-aix.spec
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,9 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/*

%changelog
* Thu May 30 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 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
* Thu May 30 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
Expand Down
4 changes: 2 additions & 2 deletions debs/SPECS/wazuh-agent/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 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, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-agent/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Thu, 30 May 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Wed, 05 Jun 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions debs/SPECS/wazuh-manager/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 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, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-manager/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Thu, 30 May 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Wed, 05 Jun 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions rpms/SPECS/wazuh-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -610,9 +610,9 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Thu May 30 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 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
* Thu May 30 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
Expand Down
4 changes: 2 additions & 2 deletions rpms/SPECS/wazuh-manager.spec
Original file line number Diff line number Diff line change
Expand Up @@ -855,9 +855,9 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Thu May 30 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 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
* Thu May 30 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
Expand Down
4 changes: 2 additions & 2 deletions stack/dashboard/deb/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 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, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/deb/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Thu, 30 May 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Wed, 05 Jun 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions stack/dashboard/rpm/wazuh-dashboard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,9 @@ rm -fr %{buildroot}
%config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml"

%changelog
* Thu May 30 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 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
* Thu May 30 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
Expand Down
4 changes: 2 additions & 2 deletions stack/indexer/deb/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 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, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/deb/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

Wazuh, Inc <[email protected]> on Thu, 30 May 2024 00:00:00 +0000
Wazuh, Inc <[email protected]> on Wed, 05 Jun 2024 00:00:00 +0000

It was downloaded from:

Expand Down
4 changes: 2 additions & 2 deletions stack/indexer/rpm/wazuh-indexer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -681,9 +681,9 @@ rm -fr %{buildroot}


%changelog
* Thu May 30 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 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
* Thu May 30 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
Expand Down

0 comments on commit aec4758

Please sign in to comment.