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.2 into 4.8.0 #2741

Merged
merged 6 commits into from
Jan 5, 2024
Merged

Merge 4.7.2 into 4.8.0 #2741

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
ce878c4
Update release date for 4.7.2
vikman90 Dec 22, 2023
6ac1f30
Merge pull request #2720 from wazuh/change/4.7.2-release-date
vikman90 Dec 22, 2023
19cafa2
The change was reverted to obtain the Wazuh version of the VERSION file
c-bordon Dec 27, 2023
88b3f81
Merge pull request #2727 from wazuh/change/2724-ova-generation-fails-…
teddytpc1 Dec 28, 2023
b838cd3
Merge branch '4.7.2' into merge-4.7.2-into-4.8.0
pereyra-m Jan 5, 2024
c7d4df1
Fix source branch version
pereyra-m Jan 5, 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
2 changes: 1 addition & 1 deletion aix/SPECS/wazuh-agent-aix.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ rm -fr %{buildroot}
%changelog
* Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
* Wed Dec 13 2023 support <info@wazuh.com> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-agent/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wazuh-agent (4.7.2-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <info@wazuh.com> Sun, 17 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <info@wazuh.com> Tue, 09 Jan 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-manager/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wazuh-manager (4.7.2-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <info@wazuh.com> Sun, 17 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <info@wazuh.com> Tue, 09 Jan 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion rpms/SPECS/wazuh-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ rm -fr %{buildroot}
%changelog
* Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
* Wed Dec 13 2023 support <info@wazuh.com> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
Expand Down
2 changes: 1 addition & 1 deletion rpms/SPECS/wazuh-manager.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ rm -fr %{buildroot}
%changelog
* Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
* Wed Dec 13 2023 support <info@wazuh.com> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wazuh-dashboard (4.7.2-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <info@wazuh.com> Sun, 17 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <info@wazuh.com> Tue, 09 Jan 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/rpm/wazuh-dashboard.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ rm -fr %{buildroot}
%changelog
* Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
* Wed Dec 13 2023 support <info@wazuh.com> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wazuh-indexer (4.7.2-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <info@wazuh.com> Sun, 17 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <info@wazuh.com> Tue, 09 Jan 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/rpm/wazuh-indexer.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ rm -fr %{buildroot}
%changelog
* Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
* Wed Dec 13 2023 support <info@wazuh.com> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
Expand Down
3 changes: 1 addition & 2 deletions unattended_installer/builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool"
readonly resources_passwords="${base_path_builder}/passwords_tool"
readonly resources_common="${base_path_builder}/common_functions"
readonly resources_download="${base_path_builder}/downloader"
readonly source_directory="$( cd $(dirname $0) ; pwd -P )"
source_branch=$(cat ${source_directory}/../VERSION)
source_branch="4.8.0"

function getHelp() {

Expand Down
Loading