From 9b952768fbd325cf43a6edd65bca52a2556a3f12 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Wed, 18 Oct 2017 12:43:15 -0400 Subject: [PATCH] Fixes error caused by merge conflict Signed-off-by: David Vossel --- pkg/virt-controller/watch/vm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/virt-controller/watch/vm.go b/pkg/virt-controller/watch/vm.go index 9619e8d9f1a9..424afed98ff3 100644 --- a/pkg/virt-controller/watch/vm.go +++ b/pkg/virt-controller/watch/vm.go @@ -256,7 +256,7 @@ func (c *VMController) execute(key string) (bool, error) { err := c.vmService.DeleteVMPod(vm) if err != nil { logger.Error().Reason(err).Msg("Deleting VM target Pod failed.") - return err + return false, err } logger.Info().Msg("Deleted VM target Pod for VM in finalized state.") }