Skip to content

Commit

Permalink
Merge 4.10.0 into master (#379)
Browse files Browse the repository at this point in the history
* Merge 4.9.2 into 4.10.0 (#378)

* Update changelog
  • Loading branch information
AlexRuiz7 committed Nov 18, 2024
1 parent b186d44 commit ebfbccf
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ All notable changes to this project are documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on how to add changelog entries.

## [Unreleased 2.x]
## [Unreleased 5.0.x]
### Added

### Dependencies
Expand All @@ -18,4 +18,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

### Security

[Unreleased 2.18.x]: https://github.com/opensearch-project/OpenSearch/compare/d27ee4eb710db4d5d0776065d79408d91fd4f315...2.18
[Unreleased 5.0.x]: https://github.com/wazuh/wazuh-indexer/compare/4.10.2...master
10 changes: 5 additions & 5 deletions build-scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations
```
artifacts/
|-- dist
| |-- wazuh-indexer-min_4.9.1_amd64.deb
| |-- wazuh-indexer-min_5.0.0_amd64.deb
`-- tmp
`-- deb
|-- Makefile
Expand All @@ -109,7 +109,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations
|-- etc
|-- usr
|-- var
`-- wazuh-indexer-min_4.9.1_amd64.deb
`-- wazuh-indexer-min_5.0.0_amd64.deb
```

`usr`, `etc` and `var` folders contain `wazuh-indexer` files, extracted from `wazuh-indexer-min-*.deb`.
Expand All @@ -132,8 +132,8 @@ For DEB packages, the `assemble.sh` script will perform the following operations
artifacts/
|-- artifact_name.txt
|-- dist
| |-- wazuh-indexer-min_4.9.1_amd64.deb
| `-- wazuh-indexer_4.9.1_amd64.deb
| |-- wazuh-indexer-min_5.0.0_amd64.deb
| `-- wazuh-indexer_5.0.0_amd64.deb
`-- tmp
`-- deb
|-- Makefile
Expand All @@ -142,7 +142,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations
|-- etc
|-- usr
|-- var
|-- wazuh-indexer-min_4.9.1_amd64.deb
|-- wazuh-indexer-min_5.0.0_amd64.deb
`-- debian/
| -- control
| -- copyright
Expand Down
4 changes: 4 additions & 0 deletions distribution/packages/src/rpm/wazuh-indexer.rpm.spec
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,12 @@ exit 0
%attr(750, %{name}, %{name}) %{product_dir}/performance-analyzer-rca/bin/*

%changelog
* Fri Sep 06 2024 support <[email protected]> - 5.0.0
- More info: https://documentation.wazuh.com/current/release-notes/release-5.0.0-0.html
* Tue Aug 20 2024 support <[email protected]> - 4.10.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
* Fri Sep 06 2024 support <[email protected]> - 4.9.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
* Thu Aug 15 2024 support <[email protected]> - 4.9.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
* Thu Aug 15 2024 support <[email protected]> - 4.9.0
Expand Down

0 comments on commit ebfbccf

Please sign in to comment.