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.11.0 into 4.12.0 #1237

Merged
merged 11 commits into from
Feb 4, 2025
Merged

Merge 4.11.0 into 4.12.0 #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bfbf112
bump 4.10.2 version
vcerenu Jan 17, 2025
7c635c8
bump revision to 41101
CarlosALgit Jan 24, 2025
305e879
Merge pull request #1228 from wazuh/enhancement/1227-bump-revision-to…
teddytpc1 Jan 24, 2025
47e616e
Modify the version used unto the Wazuh indexer and Wazuh manager depl…
vcerenu Jan 31, 2025
eb22929
Add changelog
vcerenu Feb 3, 2025
0afb27f
Merge pull request #1229 from wazuh/bug/4680-wazuh-version-fixed
teddytpc1 Feb 3, 2025
a3434fb
Resolving merge conflicts
vcerenu Feb 4, 2025
fdd5972
Merge pull request #1235 from wazuh/merge-4.10.2-into-4.11.0
c-bordon Feb 4, 2025
802a654
Detele 4.10.2 references
vcerenu Feb 4, 2025
b307449
Resolving merge conflicts
vcerenu Feb 4, 2025
5998639
Resolving merge conflicts
vcerenu Feb 4, 2025
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ All notable changes to this project will be documented in this file.

### Fixed

- None
- Modify the version used into the Wazuh indexer and Wazuh manager deployment ([#1229](https://github.com/wazuh/wazuh-puppet/pull/1229))

### Deleted

- None

## Wazuh Puppet v4.10.1
## [4.10.1]

### Added

Expand Down
2 changes: 1 addition & 1 deletion manifests/indexer.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
$indexer_node_max_local_storage_nodes = '1',
$indexer_service = 'wazuh-indexer',
$indexer_package = 'wazuh-indexer',
$indexer_version = '4.12.0-1',
$indexer_version = '4.12.0',
$indexer_fileuser = 'wazuh-indexer',
$indexer_filegroup = 'wazuh-indexer',

Expand Down
2 changes: 1 addition & 1 deletion manifests/params_manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'Linux': {

# Installation
$server_package_version = '4.12.0-1'
$server_package_version = '4.12.0'

$manage_firewall = false

Expand Down
Loading