This is an automated email from the ASF dual-hosted git repository.

msciabarra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openserverless-task.git


The following commit(s) were added to refs/heads/main by this push:
     new 9a18a5b  urgent fix
9a18a5b is described below

commit 9a18a5bebde4c5781f7e0849e0d08dcb9d34bf03
Author: Michele Sciabarra <“[email protected]”>
AuthorDate: Sun Dec 14 16:09:09 2025 +0100

    urgent fix
---
 setup/docker/opsfile.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/setup/docker/opsfile.yml b/setup/docker/opsfile.yml
index 528c707..1fb27a4 100644
--- a/setup/docker/opsfile.yml
+++ b/setup/docker/opsfile.yml
@@ -67,7 +67,6 @@ tasks:
     - >
       kind create cluster
       --kubeconfig="$OPS_TMP/kubeconfig"
-<<<<<<< HEAD
       --wait=1m --name=nuvolaris
       --config=_kind.yaml
     - |
@@ -80,12 +79,7 @@ tasks:
         skip_verify = true
       EOF'
       docker exec nuvolaris-control-plane systemctl restart containerd
- 
-=======
-      --wait=1m --name={{.CLUSTER}}
-      --config=_kind.yaml
 
->>>>>>> 2afc1a6 (offline images)
   ingress:
     silent: true
     cmds:

Reply via email to