From 16a1c08330a7c4fb514d59b281a30cecf4dddb1c Mon Sep 17 00:00:00 2001 From: Krystof Stekovic Date: Tue, 19 Nov 2024 16:17:40 +0100 Subject: [PATCH 1/2] [WFLY-19949] resolve unresolved conflict --- logging/src/charts/helm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/logging/src/charts/helm.yaml b/logging/src/charts/helm.yaml index 80efbd5db8..f3e9d294ce 100644 --- a/logging/src/charts/helm.yaml +++ b/logging/src/charts/helm.yaml @@ -1,10 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git -<<<<<<< HEAD - ref: 31.x-glow-preview -======= ref: main ->>>>>>> upstream/main contextDir: logging deploy: replicas: 1 \ No newline at end of file From 1bc616e408d64df8ea24a7df3d432b21a13b35ce Mon Sep 17 00:00:00 2001 From: Krystof Stekovic Date: Tue, 19 Nov 2024 16:22:58 +0100 Subject: [PATCH 2/2] [WFLY-19971] move chart configuration to the logging QS folder --- logging/{src => }/charts/helm.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename logging/{src => }/charts/helm.yaml (100%) diff --git a/logging/src/charts/helm.yaml b/logging/charts/helm.yaml similarity index 100% rename from logging/src/charts/helm.yaml rename to logging/charts/helm.yaml