From db8bbaaccaaeafe4702d1ab24bde3c328e41eb54 Mon Sep 17 00:00:00 2001 From: wazuhci <22834044+wazuhci@users.noreply.github.com> Date: Tue, 29 Jul 2025 16:13:21 +0000 Subject: [PATCH 1/9] feat: bump 4.14.1 --- CHANGELOG.md | 18 ++++++++++++++++++ VERSION.json | 2 +- .../wazuh-dashboard/dashboard-deploy.yaml | 2 +- .../wazuh-indexer/cluster/indexer-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-worker-sts.yaml | 2 +- 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19cd3e5..a7202c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ All notable changes to this project will be documented in this file. +## [4.14.1] + +### Added + +- None + +### Changed + +- None + +### Fixed + +- None + +### Deleted + +- None + ## [4.14.0] ### Added diff --git a/VERSION.json b/VERSION.json index af2b5c0..f39ee7a 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,4 +1,4 @@ { - "version": "4.14.0", + "version": "4.14.1", "stage": "alpha0" } diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index 7fb9445..6c7423e 100644 --- a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml +++ b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml @@ -32,7 +32,7 @@ spec: secretName: dashboard-certs containers: - name: wazuh-dashboard - image: 'wazuh/wazuh-dashboard:4.14.0' + image: 'wazuh/wazuh-dashboard:4.14.1' resources: limits: cpu: 500m diff --git a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml index 266e30f..5692372 100644 --- a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml +++ b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml @@ -59,7 +59,7 @@ spec: privileged: true containers: - name: wazuh-indexer - image: 'wazuh/wazuh-indexer:4.14.0' + image: 'wazuh/wazuh-indexer:4.14.1' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index 24bf4e2..f54ec9f 100644 --- a/wazuh/wazuh_managers/wazuh-master-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-master-sts.yaml @@ -41,7 +41,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.14.0' + image: 'wazuh/wazuh-manager:4.14.1' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index 870a4d6..f52e520 100644 --- a/wazuh/wazuh_managers/wazuh-worker-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-worker-sts.yaml @@ -48,7 +48,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.14.0' + image: 'wazuh/wazuh-manager:4.14.1' resources: limits: cpu: 400m From 215abc01b573eaa36aff0a331ec87bb323b68da8 Mon Sep 17 00:00:00 2001 From: wazuhci <22834044+wazuhci@users.noreply.github.com> Date: Wed, 30 Jul 2025 07:44:47 +0000 Subject: [PATCH 2/9] feat: bump 4.13.0 --- VERSION.json | 2 +- wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml | 2 +- wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-worker-sts.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION.json b/VERSION.json index 25df539..7fadd29 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,4 +1,4 @@ { "version": "4.13.0", - "stage": "rc2" + "stage": "rc3" } diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index a0e5524..6e0ab97 100644 --- a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml +++ b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml @@ -32,7 +32,7 @@ spec: secretName: dashboard-certs containers: - name: wazuh-dashboard - image: 'wazuh/wazuh-dashboard:4.13.0' + image: 'wazuh/wazuh-dashboard:4.13.0-rc3' resources: limits: cpu: 500m diff --git a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml index 18aa099..8f03307 100644 --- a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml +++ b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml @@ -59,7 +59,7 @@ spec: privileged: true containers: - name: wazuh-indexer - image: 'wazuh/wazuh-indexer:4.13.0' + image: 'wazuh/wazuh-indexer:4.13.0-rc3' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index 6adc1eb..fbfec82 100644 --- a/wazuh/wazuh_managers/wazuh-master-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-master-sts.yaml @@ -41,7 +41,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.13.0' + image: 'wazuh/wazuh-manager:4.13.0-rc3' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index 304a282..3e1509a 100644 --- a/wazuh/wazuh_managers/wazuh-worker-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-worker-sts.yaml @@ -48,7 +48,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.13.0' + image: 'wazuh/wazuh-manager:4.13.0-rc3' resources: limits: cpu: 400m From dc1a695be7f02ead2cb810869abbc3ea5fa8ad66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Wed, 30 Jul 2025 10:33:24 +0200 Subject: [PATCH 3/9] revert image tag for 4.13.0-rc3 --- wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml | 2 +- wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-worker-sts.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index 6e0ab97..a0e5524 100644 --- a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml +++ b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml @@ -32,7 +32,7 @@ spec: secretName: dashboard-certs containers: - name: wazuh-dashboard - image: 'wazuh/wazuh-dashboard:4.13.0-rc3' + image: 'wazuh/wazuh-dashboard:4.13.0' resources: limits: cpu: 500m diff --git a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml index 8f03307..18aa099 100644 --- a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml +++ b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml @@ -59,7 +59,7 @@ spec: privileged: true containers: - name: wazuh-indexer - image: 'wazuh/wazuh-indexer:4.13.0-rc3' + image: 'wazuh/wazuh-indexer:4.13.0' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index fbfec82..6adc1eb 100644 --- a/wazuh/wazuh_managers/wazuh-master-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-master-sts.yaml @@ -41,7 +41,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.13.0-rc3' + image: 'wazuh/wazuh-manager:4.13.0' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index 3e1509a..304a282 100644 --- a/wazuh/wazuh_managers/wazuh-worker-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-worker-sts.yaml @@ -48,7 +48,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.13.0-rc3' + image: 'wazuh/wazuh-manager:4.13.0' resources: limits: cpu: 400m From 4e9ffe5755b31659e231b302f2e21ae689316719 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 5 Aug 2025 15:24:47 -0300 Subject: [PATCH 4/9] Add new config path and new permission for conf ans certs files --- .../wazuh-indexer/cluster/indexer-sts.yaml | 20 ++++++++++++------- .../wazuh-indexer/indexer_conf/opensearch.yml | 12 +++++------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml index 266e30f..9899a22 100644 --- a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml +++ b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml @@ -24,14 +24,18 @@ spec: app: wazuh-indexer name: wazuh-indexer spec: + securityContext: + fsGroup: 1000 # Set the wazuh-indexer volume permissions so the wazuh-indexer user can use it volumes: - name: indexer-certs secret: secretName: indexer-certs + defaultMode: 0600 - name: indexer-conf configMap: name: indexer-conf + defaultMode: 0600 initContainers: - name: volume-mount-hack image: busybox @@ -84,37 +88,39 @@ spec: - name: DISABLE_INSTALL_DEMO_CONFIG value: 'true' securityContext: + runAsUser: 1000 + runAsGroup: 1000 capabilities: add: ["SYS_CHROOT"] volumeMounts: - name: wazuh-indexer mountPath: /var/lib/wazuh-indexer - name: indexer-certs - mountPath: /usr/share/wazuh-indexer/certs/node-key.pem + mountPath: /usr/share/wazuh-indexer/config/certs/node-key.pem subPath: node-key.pem readOnly: true - name: indexer-certs - mountPath: /usr/share/wazuh-indexer/certs/node.pem + mountPath: /usr/share/wazuh-indexer/config/certs/node.pem subPath: node.pem readOnly: true - name: indexer-certs - mountPath: /usr/share/wazuh-indexer/certs/root-ca.pem + mountPath: /usr/share/wazuh-indexer/config/certs/root-ca.pem subPath: root-ca.pem readOnly: true - name: indexer-certs - mountPath: /usr/share/wazuh-indexer/certs/admin.pem + mountPath: /usr/share/wazuh-indexer/config/certs/admin.pem subPath: admin.pem readOnly: true - name: indexer-certs - mountPath: /usr/share/wazuh-indexer/certs/admin-key.pem + mountPath: /usr/share/wazuh-indexer/config/certs/admin-key.pem subPath: admin-key.pem readOnly: true - name: indexer-conf - mountPath: /usr/share/wazuh-indexer/opensearch.yml + mountPath: /usr/share/wazuh-indexer/config/opensearch.yml subPath: opensearch.yml readOnly: true - name: indexer-conf - mountPath: /usr/share/wazuh-indexer/opensearch-security/internal_users.yml + mountPath: /usr/share/wazuh-indexer/config/opensearch-security/internal_users.yml subPath: internal_users.yml readOnly: true ports: diff --git a/wazuh/indexer_stack/wazuh-indexer/indexer_conf/opensearch.yml b/wazuh/indexer_stack/wazuh-indexer/indexer_conf/opensearch.yml index 1a708a5..a11dba7 100644 --- a/wazuh/indexer_stack/wazuh-indexer/indexer_conf/opensearch.yml +++ b/wazuh/indexer_stack/wazuh-indexer/indexer_conf/opensearch.yml @@ -8,12 +8,12 @@ cluster.initial_master_nodes: node.max_local_storage_nodes: "3" path.data: /var/lib/wazuh-indexer path.logs: /var/log/wazuh-indexer -plugins.security.ssl.http.pemcert_filepath: /usr/share/wazuh-indexer/certs/node.pem -plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/certs/node-key.pem -plugins.security.ssl.http.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem -plugins.security.ssl.transport.pemcert_filepath: /usr/share/wazuh-indexer/certs/node.pem -plugins.security.ssl.transport.pemkey_filepath: /usr/share/wazuh-indexer/certs/node-key.pem -plugins.security.ssl.transport.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem +plugins.security.ssl.http.pemcert_filepath: /usr/share/wazuh-indexer/config/certs/node.pem +plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/config/certs/node-key.pem +plugins.security.ssl.http.pemtrustedcas_filepath: /usr/share/wazuh-indexer/config/certs/root-ca.pem +plugins.security.ssl.transport.pemcert_filepath: /usr/share/wazuh-indexer/config/certs/node.pem +plugins.security.ssl.transport.pemkey_filepath: /usr/share/wazuh-indexer/config/certs/node-key.pem +plugins.security.ssl.transport.pemtrustedcas_filepath: /usr/share/wazuh-indexer/config/certs/root-ca.pem plugins.security.ssl.http.enabled: true plugins.security.ssl.transport.enforce_hostname_verification: false plugins.security.ssl.transport.resolve_hostname: false From 6ac698862564074f170ef75d8b3da3ecb9048421 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 5 Aug 2025 15:28:19 -0300 Subject: [PATCH 5/9] Add changeog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19cd3e5..f8946f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- None +- Add new config path and new permission for conf and certs files ([#1152](https://github.com/wazuh/wazuh-kubernetes/pull/1152)) ### Deleted From 28892738edfa437ce958d46488006a33f21d0b11 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 7 Aug 2025 08:34:31 -0300 Subject: [PATCH 6/9] Bump rc4 stage --- VERSION.json | 2 +- wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml | 2 +- wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-master-sts.yaml | 2 +- wazuh/wazuh_managers/wazuh-worker-sts.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION.json b/VERSION.json index 7fadd29..a66d259 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,4 +1,4 @@ { "version": "4.13.0", - "stage": "rc3" + "stage": "rc4" } diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index a0e5524..0bac9d3 100644 --- a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml +++ b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml @@ -32,7 +32,7 @@ spec: secretName: dashboard-certs containers: - name: wazuh-dashboard - image: 'wazuh/wazuh-dashboard:4.13.0' + image: 'wazuh/wazuh-dashboard:4.13.0-rc4' resources: limits: cpu: 500m diff --git a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml index 18aa099..ac7bd9b 100644 --- a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml +++ b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml @@ -59,7 +59,7 @@ spec: privileged: true containers: - name: wazuh-indexer - image: 'wazuh/wazuh-indexer:4.13.0' + image: 'wazuh/wazuh-indexer:4.13.0-rc4' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index 6adc1eb..7ff7d79 100644 --- a/wazuh/wazuh_managers/wazuh-master-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-master-sts.yaml @@ -41,7 +41,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.13.0' + image: 'wazuh/wazuh-manager:4.13.0-rc4' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index 304a282..c6db221 100644 --- a/wazuh/wazuh_managers/wazuh-worker-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-worker-sts.yaml @@ -48,7 +48,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager - image: 'wazuh/wazuh-manager:4.13.0' + image: 'wazuh/wazuh-manager:4.13.0-rc4' resources: limits: cpu: 400m From 24c7df995e74755a8b30955706f3ce5e82b04b33 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 7 Aug 2025 08:47:10 -0300 Subject: [PATCH 7/9] Revert tag --- CHANGELOG.md | 18 ------------------ .../wazuh-dashboard/dashboard-deploy.yaml | 6 +----- .../wazuh-indexer/cluster/indexer-sts.yaml | 6 +----- wazuh/wazuh_managers/wazuh-master-sts.yaml | 6 +----- wazuh/wazuh_managers/wazuh-worker-sts.yaml | 6 +----- 5 files changed, 4 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48d8ae1..2ba5b99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,24 +2,6 @@ All notable changes to this project will be documented in this file. -## [4.13.1] - -### Added - -- None - -### Changed - -- None - -### Fixed - -- None - -### Deleted - -- None - ## [4.13.0] ### Added diff --git a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml index 565d0bc..a0e5524 100644 --- a/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml +++ b/wazuh/indexer_stack/wazuh-dashboard/dashboard-deploy.yaml @@ -32,11 +32,7 @@ spec: secretName: dashboard-certs containers: - name: wazuh-dashboard -<<<<<<< HEAD - image: 'wazuh/wazuh-dashboard:4.13.0-rc4' -======= - image: 'wazuh/wazuh-dashboard:4.13.1' ->>>>>>> 71e728657210cf4e9bf996ecfa1e5c7d58a123ca + image: 'wazuh/wazuh-dashboard:4.13.0' resources: limits: cpu: 500m diff --git a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml index d32d927..18aa099 100644 --- a/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml +++ b/wazuh/indexer_stack/wazuh-indexer/cluster/indexer-sts.yaml @@ -59,11 +59,7 @@ spec: privileged: true containers: - name: wazuh-indexer -<<<<<<< HEAD - image: 'wazuh/wazuh-indexer:4.13.0-rc4' -======= - image: 'wazuh/wazuh-indexer:4.13.1' ->>>>>>> 71e728657210cf4e9bf996ecfa1e5c7d58a123ca + image: 'wazuh/wazuh-indexer:4.13.0' resources: limits: cpu: 500m diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml index 49b148f..6adc1eb 100644 --- a/wazuh/wazuh_managers/wazuh-master-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-master-sts.yaml @@ -41,11 +41,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager -<<<<<<< HEAD - image: 'wazuh/wazuh-manager:4.13.0-rc4' -======= - image: 'wazuh/wazuh-manager:4.13.1' ->>>>>>> 71e728657210cf4e9bf996ecfa1e5c7d58a123ca + image: 'wazuh/wazuh-manager:4.13.0' resources: limits: cpu: 400m diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml index 807e8a9..304a282 100644 --- a/wazuh/wazuh_managers/wazuh-worker-sts.yaml +++ b/wazuh/wazuh_managers/wazuh-worker-sts.yaml @@ -48,11 +48,7 @@ spec: fsGroup: 101 containers: - name: wazuh-manager -<<<<<<< HEAD - image: 'wazuh/wazuh-manager:4.13.0-rc4' -======= - image: 'wazuh/wazuh-manager:4.13.1' ->>>>>>> 71e728657210cf4e9bf996ecfa1e5c7d58a123ca + image: 'wazuh/wazuh-manager:4.13.0' resources: limits: cpu: 400m From 1263e076c6eff1b53caaeca4a700e6df2bf81f8d Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 7 Aug 2025 08:47:53 -0300 Subject: [PATCH 8/9] Resolvinmg conflicts --- VERSION.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/VERSION.json b/VERSION.json index d5825f0..a66d259 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,9 +1,4 @@ { -<<<<<<< HEAD "version": "4.13.0", "stage": "rc4" -======= - "version": "4.13.1", - "stage": "alpha0" ->>>>>>> 71e728657210cf4e9bf996ecfa1e5c7d58a123ca } From 3cfbde3018b0c5490d40e28d3ffc5aad1b16f5e7 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 7 Aug 2025 08:49:25 -0300 Subject: [PATCH 9/9] Revert tag --- VERSION.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.json b/VERSION.json index a66d259..7fadd29 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,4 +1,4 @@ { "version": "4.13.0", - "stage": "rc4" + "stage": "rc3" }