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.8.1 into master #2652

Merged
merged 49 commits into from
Nov 29, 2023
Merged

Merge 4.8.1 into master #2652

merged 49 commits into from
Nov 29, 2023

Conversation

vikman90
Copy link
Member

Related issue
#2642

rauldpm and others added 30 commits November 10, 2023 20:35
@rauldpm
Added support to multiples Wazuh dashboard plugins
c28c2a0
@rauldpm
Improved help message
4850fe1
@rauldpm
Added plugin revisions check
f37d379
@AlexRuiz7
Update min_doc_count value
69b1629
@c-bordon
Merge pull request #2598 from wazuh/update-init-ism-script
325b7a5 
Update `min_doc_count` value
@c-bordon
Updated Filebeat module version to 0.3
86e6c15
@c-bordon
Merge pull request #2605 from wazuh/change/2604-update-filebeat-modul…
bc50b70 
…e-to-03-version-in-unattended

Updated Filebeat module version to 0.3
@AlexRuiz7
Improve ISM init script
20a3a65
@AlexRuiz7
Change log file path
e3db1e9
@AlexRuiz7
Merge pull request #2606 from wazuh/update-init-ism-script
003673f 
Improve ISM init script
@rauldpm
Improved help message
28ed9a7
@rauldpm
Adapted package build to install the new wazuh plugins
11adba4
@rauldpm
Fixed URL definition
faee743
@mjcr99
Added permissions change for merged.mg files in upgrade
8d4574c
@rauldpm
Fixed typo in logo name
54f733f
@rauldpm
Improved parameters
ad42f01
@mjcr99
Updated action-wait-for-workflow version
13d1b77
@vikman90
Merge pull request #2611 from wazuh/fix5929-change-mergedmg-permissions
a0d2168 
Added permissions change for merged.mg files in upgrade
@davidcr01
Removed PDF report dependencies
f1b3813
@ed108206
Update build.sh
4f3d5e0 
new SCA file
@ed108206
Update wazuh-manager.spec
daf3929 
new SCA file
@ed108206
Update rules
6ca7f4b 
new SCA file
@vikman90
Bump version to 4.8.1
c27ace0
@mjcr99
Changed REVISION debs name
67ac826
@mjcr99
Changed REVISION rpms name
0809738
@c-bordon
Added validation for CentOS Repos
b688b64
@teddytpc1
Merge pull request #2619 from wazuh/remove-report-dependencies-4.7.0
7f129ef 
Removed PDF report dependencies
@jotacarma90
Fix some SPECS versions in the new SCA file from macOS 14
dff2d82
@davidjiglesias
Merge pull request #2609 from wazuh/enhancement/2589-add-new-wazuh-apps
ecb77fa 
Adapt wazuhapp and Wazuh dashboard to install the Wazuh CheckUpdates and Core plugins
@davidcr01
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1
3a4da62
teddytpc1 and others added 19 commits November 22, 2023 14:32
@teddytpc1
Merge pull request #2626 from wazuh/merge-4.7.0-into-4.7.1
fab52f5 
Merge 4.7.0 into 4.7.1
@davidcr01
Improved message of CentOS key import failure
e20815e
@teddytpc1
Merge pull request #2627 from wazuh/enhancement/2625-improve-message-…
fde94b8 
…after-centos-key-import-in-wia

Improved message of CentOS key import failure
@vikman90
Merge pull request #2624 from wazuh/17149-create-sca-policy-for-macos-14
59c131a 
Add SPECS to sca file macOS 14 sonoma
@vikman90
Update the release ETA for 4.7.0
af4fb8e
@vikman90
Fix 4.6.0 release date
e757b56
@vikman90
Merge pull request #2631 from wazuh/change-2926-eta-4.7.0
26c2b9a 
Update the release ETA for 4.7.0
@vikman90
Merge pull request #2618 from wazuh/fix/2333-branch-name-causes-test-…
eed7115 
…fail

Added package_release name modification
@JcabreraC
Merge branch '4.7.0' into '4.7.1'
52e116a
@JcabreraC
Merge pull request #2633 from wazuh/merge-4.7.0-into-4.7.1
541a8f1 
Merge 4.7.0 into 4.7.1
@c-bordon
Changed check yum lock function
69c9998
@teddytpc1
Merge pull request #2639 from wazuh/bug/2638-error-when-searching-for…
888b4e1 
…-the-installcommon_checkyumlock-method-in-the-password-tool-to4.8.0

Changed check yum lock function
@vikman90
Update ETA date for 4.7.1
fd72f2c
@Dwordcito
Merge pull request #2644 from wazuh/2643-update-eta-4.7.1
d345399 
Update ETA date for 4.7.1
@TomasTurina
Merge branch '4.7.1' into merge-4.7.1-into-4.8.0
250ccd1
@vikman90
Merge pull request #2648 from wazuh/merge-4.7.1-into-4.8.0
67c70c8 
Merge 4.7.1 into 4.8.0
@vikman90
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
1a1ecfc
@vikman90
Merge pull request #2651 from wazuh/merge-4.8.0-into-4.8.1
08f6704 
Merge 4.8.0 into 4.8.1
@vikman90
Merge branch '4.8.1' into merge-4.8.1-into-master
59aa5ea
@vikman90 vikman90 requested a review from TomasTurina November 28, 2023 16:51
@vikman90 vikman90 self-assigned this Nov 28, 2023
@vikman90 vikman90 added the type/maintenance Maintenance issue label Nov 28, 2023
@vikman90 vikman90 linked an issue Nov 28, 2023 that may be closed by this pull request
Post release tasks for 4.7.0 #2642
Closed
5 tasks
@vikman90 vikman90 mentioned this pull request Nov 28, 2023
Closed
5 tasks
@vikman90 vikman90 merged commit d7487a6 into master Nov 29, 2023
56 checks passed
@vikman90 vikman90 deleted the merge-4.8.1-into-master branch November 29, 2023 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomasTurina TomasTurina Awaiting requested review from TomasTurina

Assignees

@vikman90 vikman90

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.0