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:
Daniel J Walsh 2017-09-16 05:18:19 -04:00
commit 33fc0231f7
134 changed files with 3165 additions and 1812 deletions

View file

@ -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)
}