Skip to content

Commit 1359017

Browse files
committed
Merge 4.10.0 into master (#379)
* Merge 4.9.2 into 4.10.0 (#378) * Update changelog
1 parent 5166e4d commit 1359017

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ All notable changes to this project are documented in this file.
33

44
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.
55

6-
## [Unreleased 2.17.x]
6+
## [Unreleased 5.0.x]
77
### Added
88
- Add path prefix support to hashed prefix snapshots ([#15664](https://github.com/opensearch-project/OpenSearch/pull/15664))
99
- Memory optimisations in _cluster/health API ([#15492](https://github.com/opensearch-project/OpenSearch/pull/15492))
@@ -21,4 +21,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2121

2222
### Security
2323

24-
[Unreleased 2.17.x]: https://github.com/opensearch-project/OpenSearch/compare/01c5e5642b7450bba2f3a21acdf8cf13539f65eb...2.17
24+
[Unreleased 5.0.x]: https://github.com/wazuh/wazuh-indexer/compare/92ffe2ed8a743c07a1170960d5949fcd6ed12e89...master

build-scripts/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations
100100
```
101101
artifacts/
102102
|-- dist
103-
| |-- wazuh-indexer-min_4.9.1_amd64.deb
103+
| |-- wazuh-indexer-min_5.0.0_amd64.deb
104104
`-- tmp
105105
`-- deb
106106
|-- Makefile
@@ -109,7 +109,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations
109109
|-- etc
110110
|-- usr
111111
|-- var
112-
`-- wazuh-indexer-min_4.9.1_amd64.deb
112+
`-- wazuh-indexer-min_5.0.0_amd64.deb
113113
```
114114

115115
`usr`, `etc` and `var` folders contain `wazuh-indexer` files, extracted from `wazuh-indexer-min-*.deb`.
@@ -132,8 +132,8 @@ For DEB packages, the `assemble.sh` script will perform the following operations
132132
artifacts/
133133
|-- artifact_name.txt
134134
|-- dist
135-
| |-- wazuh-indexer-min_4.9.1_amd64.deb
136-
| `-- wazuh-indexer_4.9.1_amd64.deb
135+
| |-- wazuh-indexer-min_5.0.0_amd64.deb
136+
| `-- wazuh-indexer_5.0.0_amd64.deb
137137
`-- tmp
138138
`-- deb
139139
|-- Makefile
@@ -142,7 +142,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations
142142
|-- etc
143143
|-- usr
144144
|-- var
145-
|-- wazuh-indexer-min_4.9.1_amd64.deb
145+
|-- wazuh-indexer-min_5.0.0_amd64.deb
146146
`-- debian/
147147
| -- control
148148
| -- copyright

distribution/packages/src/rpm/wazuh-indexer.rpm.spec

+4
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,12 @@ exit 0
265265
%attr(750, %{name}, %{name}) %{product_dir}/performance-analyzer-rca/bin/*
266266

267267
%changelog
268+
* Fri Sep 06 2024 support <[email protected]> - 5.0.0
269+
- More info: https://documentation.wazuh.com/current/release-notes/release-5.0.0-0.html
268270
* Tue Aug 20 2024 support <[email protected]> - 4.10.0
269271
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
272+
* Fri Sep 06 2024 support <[email protected]> - 4.9.2
273+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
270274
* Thu Aug 15 2024 support <[email protected]> - 4.9.1
271275
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
272276
* Thu Aug 15 2024 support <[email protected]> - 4.9.0

0 commit comments

Comments
 (0)