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.9.0 into master #2937

Merged
merged 32 commits into from
May 2, 2024
Merged

Merge 4.9.0 into master #2937

merged 32 commits into from
May 2, 2024

Conversation

MarcelKemp
Copy link
Member

Related issue
#2930

davidcr01 and others added 30 commits March 21, 2024 17:14
@davidcr01
Changed RAM fetch
fbdf540
@teddytpc1
Merge pull request #2900 from wazuh/1485-language-agnostic-installati…
9339b57 
…on-assistant

Installation Assistant language agnostic
@MarcelKemp
chore: update release date for 4.8.0
1371f6c
@MarcelKemp
Merge pull request #2903 from wazuh/maintenance/4.8.0-release-date
8360e23 
Update release date for 4.8.0
@davidjiglesias
Update copyright
35f2723
@davidcr01
HW checks is done before dependencies installation
c5749d8
@teddytpc1
Merge pull request #2906 from wazuh/bug/2905-improve-hw-check-depende…
3ad9a50 
…ncies-install-order

HW checks is done before dependencies installation
@lchico
fix: add bash dependecy to wazuh-agent-aix.spec
6eacd09
@MarcelKemp
ci: avoid failed dashboard and indexer checks
4e421dd
@vikman90
Merge pull request #2909 from wazuh/test/2901-prevent-failed-checks
acf9f0c 
Prevent failed checks related to dashboard and indexer
@CarlosALgit
changed logfile and modified common_logger function to write on files…
12a6dbb 
… when called by cert tool
@MarcelKemp
Merge pull request #2908 from wazuh/bug/2878-wazuh-agent-rpm-package-…
73e5bdc 
…for-aix-has-a-runtime-dependency-on-bash

Add bash dependency to Wazuh agent RPM for AIX
@CarlosALgit
added log message giving info on where logfile is located
c190b76
@CarlosALgit
unified declaration of base_path variable
077a9dc
@MarcelKemp
build: bump version to 4.7.4
9bc548c
@MarcelKemp
Merge pull request #2919 from wazuh/maintenance/2918-bump-version-4.7.4
9f908ff 
Bump version to 4.7.4
@CarlosALgit
nolog option has priority on common_logger conditional
7e20b38
@CarlosALgit
changed log message. added insructions on what to do on the message.
954fd48
@CarlosALgit
changed message to one more descriptive
178aca7
@vikman90
docs: change ETA for 4.7.4
4710604
@vikman90
Merge pull request #2925 from wazuh/change/2924-4.7.4-eta
a7093cc 
Change ETA for 4.7.4
@teddytpc1
Merge pull request #2911 from wazuh/change/2536-wazuh-certs-tool-log-…
a1bca34 
…file-not-defined

Cert-tool logfile added. Modified common_logger function to write on files without root permission.
@teddytpc1
Merge pull request #2922 from wazuh/bug/2444-wazuh-installation-assis…
33561f8 
…tant-unclear-error-when-yum-or-apt-are-not-found

Changed log message when not `yum` nor `apt-get` are found. Added clearer instructions on following steps.
@MarcelKemp
docs: change ETA for 4.7.4
5a13b6e
@MarcelKemp
Merge pull request #2928 from wazuh/maintenance/2927-update-eta
8f10235 
Change ETA for 4.7.4
@vikman90
Merge branch '4.7.4' into merge-4.7.4-into-4.8.0
596d007
@vikman90
build: update 4.8.0 release date
6e7cd43
@MarcelKemp
Merge pull request #2933 from wazuh/merge-4.7.4-into-4.8.0
75bff02 
Merge 4.7.4 into 4.8.0
@MarcelKemp
Merge branch '4.8.0' into merge-4.8.0-into-4.9.0
676573e
@MarcelKemp
Merge pull request #2934 from wazuh/merge-4.8.0-into-4.9.0
2e70e00 
Merge 4.8.0 into 4.9.0
@MarcelKemp MarcelKemp added the type/maintenance Maintenance issue label May 2, 2024
@MarcelKemp MarcelKemp self-assigned this May 2, 2024
@MarcelKemp MarcelKemp linked an issue May 2, 2024 that may be closed by this pull request
Post release tasks for 4.7.4 #2930
Closed
3 tasks
@MarcelKemp MarcelKemp mentioned this pull request May 2, 2024
Closed
3 tasks
JcabreraC
JcabreraC approved these changes May 2, 2024
View reviewed changes
Copy link
Member

@JcabreraC JcabreraC left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

@MarcelKemp
Copy link
Member Author

Failing checks

@MarcelKemp MarcelKemp merged commit a5b0bf8 into master May 2, 2024
56 of 59 checks passed
@MarcelKemp MarcelKemp deleted the merge-4.9.0-into-master branch May 2, 2024 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JcabreraC JcabreraC JcabreraC approved these changes

@vikman90 vikman90 Awaiting requested review from vikman90

Assignees

@MarcelKemp MarcelKemp

Labels
type/maintenance Maintenance issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Post release tasks for 4.7.4
8 participants
@MarcelKemp @JcabreraC @davidcr01 @teddytpc1 @davidjiglesias @lchico @vikman90 @CarlosALgit