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.9.2 into 4.10.0 #378

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Merge 4.9.2 into 4.10.0 #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -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.15.x]
## [Unreleased 4.9.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.15.x]: https://github.com/opensearch-project/OpenSearch/compare/0fb7c7389e69005ec581de5433861afdbeb54b4b...2.15
[Unreleased 4.9.x]: https://github.com/wazuh/wazuh-indexer/compare/5a53a90d05a7bad0ca5803ac70025dea744d789a...4.10.0
2 changes: 2 additions & 0 deletions distribution/packages/src/rpm/wazuh-indexer.rpm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,8 @@ exit 0
%changelog
* 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
10 changes: 5 additions & 5 deletions packaging_scripts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,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_4.10.0_amd64.deb
`-- tmp
`-- deb
|-- Makefile
Expand All @@ -86,7 +86,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_4.10.0_amd64.deb
```

`usr`, `etc` and `var` folders contain `wazuh-indexer` files, extracted from `wazuh-indexer-min-*.deb`.
Expand All @@ -109,8 +109,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_4.10.0_amd64.deb
| `-- wazuh-indexer_4.10.0_amd64.deb
`-- tmp
`-- deb
|-- Makefile
Expand All @@ -119,7 +119,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_4.10.0_amd64.deb
`-- debian/
| -- control
| -- copyright
Expand Down