Merge branch 'v1.0.0.rc1'

wking · wking · commit 1ea737dc1dae · 2016-08-03T10:31:26.000-07:00
* v1.0.0.rc1:
  update urfave/cli package to v1.18.0
  generate: optimize namespace setup log and fix manpage
  change param type of AddProcessAdditionalGid
  remove unnecessary return error value
  Modify generate API
  Add Travis CI badge to README
  generate: fix capability.List() for cap_last_cap not exist
  generate: remove unnecessary spec initialization
  generate: fix tmpfs adding based on manpage
  Check CAP_LAST_CAP while setting privileged
  generate: Remove superfluous err check from Save
diff --git a/generate/generate.go b/generate/generate.go
@@ -194,11 +194,7 @@ func (g *Generator) Save(w io.Writer) error {
 	}
 
 	_, err = w.Write(data)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
 
 // SaveToFile writes the spec into a file.

Original file line number	Diff line number	Diff line change
`@@ -194,11 +194,7 @@ func (g *Generator) Save(w io.Writer) error {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`_, err = w.Write(data)`
`197`		`- if err != nil {`
`198`		`- return err`
`199`		`- }`
`200`		`-`
`201`		`- return nil`
	`197`	`+ return err`
`202`	`198`	`}`
`203`	`199`
`204`	`200`	`// SaveToFile writes the spec into a file.`