Merge branch 'master' of github.com:kubernetes-incubator/cri-o into lastError
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
commit
33fc0231f7
134 changed files with 3165 additions and 1812 deletions
|
@ -105,7 +105,7 @@ func main() {
|
|||
if debug {
|
||||
logrus.Errorf(err.Error())
|
||||
} else {
|
||||
fmt.Println(err.Error())
|
||||
fmt.Fprintln(os.Stderr, err.Error())
|
||||
}
|
||||
cli.OsExiter(1)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue