Skip to content

Commit

Permalink
Fixes error caused by merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: David Vossel <[email protected]>
  • Loading branch information
davidvossel committed Oct 18, 2017
1 parent a867633 commit 9b95276
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/virt-controller/watch/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
}
Expand Down

0 comments on commit 9b95276

Please sign in to comment.