From b96437f44942393876dfeaff2cfeb6d2e9d34c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Fri, 6 Sep 2024 14:28:28 +0200 Subject: [PATCH] Merge 4.9.2 into 4.10.0 (#378) --- CHANGELOG.md | 4 ++-- distribution/packages/src/rpm/wazuh-indexer.rpm.spec | 2 ++ packaging_scripts/README.md | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f67023be9308..60b2d8a14f56f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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 diff --git a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec index 08859422ceba0..aa6a0eb2219b4 100644 --- a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec +++ b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec @@ -267,6 +267,8 @@ exit 0 %changelog * Tue Aug 20 2024 support - 4.10.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html +* Fri Sep 06 2024 support - 4.9.2 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html * Thu Aug 15 2024 support - 4.9.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html * Thu Aug 15 2024 support - 4.9.0 diff --git a/packaging_scripts/README.md b/packaging_scripts/README.md index 1c6c7cb35173a..4a8883122df7d 100644 --- a/packaging_scripts/README.md +++ b/packaging_scripts/README.md @@ -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 @@ -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`. @@ -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 @@ -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