From 73a26de5ee6ca732f712c1caf190fb21381a73f4 Mon Sep 17 00:00:00 2001 From: Jorge Sanz Date: Tue, 23 Sep 2025 15:41:44 +0200 Subject: [PATCH 1/2] Revert "[skip-ci] Disable renovate" (#482) * Revert "[skip-ci] Disable renovate (#480)" This reverts commit a172f65cb463b3a6dcc97c87f0c17cb143ac6e61. * [skip-ci] Update renovate.json (cherry picked from commit eb7de40bccd8bca4828b837bd9eabbcbc88954b8) # Conflicts: # renovate.json --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/renovate.json b/renovate.json index 397d51a4..28b7a689 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,10 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", +<<<<<<< HEAD +======= + "enabled": true, + "minimumReleaseAge": "14 days", +>>>>>>> eb7de40 (Revert "[skip-ci] Disable renovate" (#482)) "extends": [ "github>elastic/renovate-config" ] From 7362df62eb773e37ec2ff3c706445ac446176713 Mon Sep 17 00:00:00 2001 From: Jorge Sanz Date: Wed, 24 Sep 2025 15:53:32 +0200 Subject: [PATCH 2/2] [skip-ci] fix renovate.json --- renovate.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/renovate.json b/renovate.json index 28b7a689..75742d20 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", -<<<<<<< HEAD -======= "enabled": true, "minimumReleaseAge": "14 days", ->>>>>>> eb7de40 (Revert "[skip-ci] Disable renovate" (#482)) "extends": [ "github>elastic/renovate-config" ]