From 7d1bb0e2701c04917f59e8747a6e35b20ae0c90f Mon Sep 17 00:00:00 2001 From: Jorge Aguilera Date: Wed, 13 Mar 2024 08:59:00 +0100 Subject: [PATCH] fix conflicts Signed-off-by: Jorge Aguilera --- .../src/main/nextflow/nomad/executor/NomadService.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadService.groovy b/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadService.groovy index 444cb04..4dfa6e4 100644 --- a/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadService.groovy +++ b/plugins/nf-nomad/src/main/nextflow/nomad/executor/NomadService.groovy @@ -25,10 +25,11 @@ import io.nomadproject.client.models.AllocationListStub import io.nomadproject.client.models.Job import io.nomadproject.client.models.JobRegisterRequest import io.nomadproject.client.models.JobRegisterResponse -import io.nomadproject.client.models.JobSummary import io.nomadproject.client.models.Resources import io.nomadproject.client.models.Task import io.nomadproject.client.models.TaskGroup +import io.nomadproject.client.models.VolumeMount +import io.nomadproject.client.models.VolumeRequest import nextflow.nomad.NomadConfig import nextflow.processor.TaskRun import nextflow.util.MemoryUnit