Merge pull request #388 from dippynark/fix-multierror-return

jetstack-bot · web-flow · commit 597efd2d4ca1 · 2018-07-31T11:50:24.000+01:00
Return multierror with ErrorOrNil
diff --git a/pkg/tarmak/environment/environment.go b/pkg/tarmak/environment/environment.go
@@ -308,7 +308,7 @@ func (e *Environment) Verify() error {
 		result = multierror.Append(result, err)
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 func (e *Environment) WingTunnel() interfaces.Tunnel {

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ func (e *Environment) Verify() error {`
`308`	`308`	`result = multierror.Append(result, err)`
`309`	`309`	`}`
`310`	`310`
`311`		`- return result`
	`311`	`+ return result.ErrorOrNil()`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`func (e *Environment) WingTunnel() interfaces.Tunnel {`