vbatts
/
cri-o
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1086 from mrunalp/lint_fix 

lint fixes
This commit is contained in:
Antonio Murdaca 2017-10-29 06:13:21 +01:00 committed by GitHub
parent c269bf7b99 03f9350a15
commit 3ae3c41256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/sandbox_run.go
View File

@ -83,10 +83,7 @@ func (s *Server) runContainer(container *oci.Container, cgroupParent string) err
if err := s.Runtime().CreateContainer(container, cgroupParent); err != nil {
return err
}
if err := s.Runtime().StartContainer(container); err != nil {
return err
}
return nil
return s.Runtime().StartContainer(container)
}
var (

1
server/server.go
View File

@ -204,7 +204,6 @@ func New(config *Config) (*Server, error) {
s := &Server{
ContainerServer: containerServer,
netPlugin: netPlugin,
hostportManager: hostportManager,
config: *config,