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

Update 4.3 branch with master branch #875

Merged
merged 491 commits into from
Sep 15, 2021
Merged

Update 4.3 branch with master branch #875

merged 491 commits into from
Sep 15, 2021

Conversation

rauldpm
Copy link
Member

@rauldpm rauldpm commented Sep 14, 2021

This PR aims to update 4.3 branch with master branch

@davidfmiranda
Version bump
c8547a9
@davidfmiranda
Version bump
114cbe1
@davidfmiranda
Fix typo
9495bba
@davidfmiranda
Install Java in a separate function
11cfc09
@davidfmiranda
Fixed issue when overwriting installation
073d1af
@davidfmiranda
Added Wazuh manager version
9ebe4dc
@davidfmiranda
Fixed typo in Zypper instalaltion
25d2d7f
@davidfmiranda
Added version
704b5fa
@davidfmiranda
Added versions
b490054
@davidfmiranda
Added versions
5829d5e
@davidfmiranda
Fix typo
fb4ac13
@davidfmiranda
Fix versions
d229763
@davidfmiranda
Fix typo
53373be
@davidfmiranda
Updated resources URLs
5e7a3f8
@davidfmiranda
Fix typo
f74c306
@davidfmiranda
Remove custom users
5482c96
@davidfmiranda
Fix Java 8 installation
253436d
@davidfmiranda
Version bump
b63ff5a
@davidfmiranda
Added dependencies
6dfa57e
@davidfmiranda
Check RHEL
49ea215
@davidfmiranda
Fixed error with RHEL installation
9d5ef86
@davidfmiranda
Added apt update before install prerequisites
572e411
@davidfmiranda
Added apt update before install prerequisites
1f42f6c
@davidfmiranda
Updated the help function
0ebb7c6
@davidfmiranda
Refactor code
20636e7
@davidfmiranda
Rollback & overwrite function
1f81832
@davidfmiranda
Remove debug message
6e82989
@davidfmiranda
Added debug mode to rollback function
8f7d537
@davidfmiranda
Overwrite message
67aa33d
@davidfmiranda
Fix dependencies
bf6dbc4
davidfmiranda and others added 20 commits August 17, 2021 12:14
@davidfmiranda
Use variables for templates and Wazuh Kibana plugin
b12fd16
@DFolchA
Remove symlink
a023916
@DFolchA
Update AIX SPEC
6491d41
Merge pull request #831 from wazuh/apply-changes-master
96a5626 
Apply changes master
@s-ocando
Merge branch '4.1' into 4.2-rc
f3a95aa
@s-ocando
Updated Wazuh version
2363230
@s-ocando
Fixed Wazuh Kibana plugin version - unattended
f03dce3
@frankeros
fix: remove unnecessary seeds
17a844d
@rauldpm
Ready to import to wazuh-packages
7caa462
@rauldpm
Merge branch 'develop' of wazuh-documentation/resources into add-unat…
7564577 
…tended-script_master
Merge pull request #840 from wazuh/add-unattended-script_master
e7073e9 
Added unattended script master
@rauldpm
Removed older ova
0f36b70
@rauldpm
Migrated merged ova from 4.2 to master
621d3b3
Merge pull request #850 from wazuh/ova_4.2_to_master
153d3be 
Ova 4.2 to master
@DFolchA
Update changelog
0411716
@alberpilot
Merge pull request #860 from wazuh/update-master-changelog
4334edd 
Update changelog
@frankeros
fix: validate kibana version
85b2125
@alberpilot
Merge pull request #872 from wazuh/wazuhapp/update-build-script-kiban…
bfd9a00 
…a-7.11

Wazuhapp update build script kibana 7.11
@DFolchA
Merge 4.2 changes into master
271bce0
@alberpilot
Merge pull request #874 from wazuh/merge-4.2-master
646354e 
Merge 4.2 changes into master
@rauldpm rauldpm self-assigned this Sep 14, 2021
alberpilot
alberpilot approved these changes Sep 15, 2021
View reviewed changes
Copy link
Contributor

@alberpilot alberpilot left a comment

Choose a reason for hiding this comment

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

LGTM

DFolchA
DFolchA suggested changes Sep 15, 2021
View reviewed changes
Copy link
Contributor

@DFolchA DFolchA left a comment

Choose a reason for hiding this comment

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

GJ just a couple of changes

arch/SPECS/4.3.0/wazuh-agent/arch/wazuh.sysusers Outdated Show resolved Hide resolved
solaris/solaris11/SPECS/template_agent_v4.3.0.json Outdated Show resolved Hide resolved
DFolchA
DFolchA approved these changes Sep 15, 2021
View reviewed changes
Copy link
Contributor

@DFolchA DFolchA left a comment

Choose a reason for hiding this comment

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

LGTM

@alberpilot alberpilot merged commit 37191ce into 4.3 Sep 15, 2021
@alberpilot alberpilot deleted the master_to_4.3_branch-master branch September 15, 2021 07:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alberpilot alberpilot alberpilot approved these changes

@DFolchA DFolchA DFolchA approved these changes

@okynos okynos Awaiting requested review from okynos

Assignees

@rauldpm rauldpm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rauldpm @alberpilot @DFolchA @davidfmiranda @frankeros @s-ocando