github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1517 from mlaventure/remove-toml-omitempty

Browse Source 
Remove omitempty from toml tags
This commit is contained in:
Michael Crosby 2017-09-15 11:30:01 -04:00 committed by GitHub
commit 72f380af45
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux/runtime.go
View File

@ -67,15 +67,15 @@ var _ = (runtime.Runtime)(&Runtime{})
type Config struct { type Config struct {
// Shim is a path or name of binary implementing the Shim GRPC API // Shim is a path or name of binary implementing the Shim GRPC API
Shim string `toml:"shim,omitempty"` Shim string `toml:"shim"`
// Runtime is a path or name of an OCI runtime used by the shim // Runtime is a path or name of an OCI runtime used by the shim
Runtime string `toml:"runtime,omitempty"` Runtime string `toml:"runtime"`
// RuntimeRoot is the path that shall be used by the OCI runtime for its data // RuntimeRoot is the path that shall be used by the OCI runtime for its data
RuntimeRoot string `toml:"runtime_root,omitempty"` RuntimeRoot string `toml:"runtime_root"`
// NoShim calls runc directly from within the pkg // NoShim calls runc directly from within the pkg
NoShim bool `toml:"no_shim,omitempty"` NoShim bool `toml:"no_shim"`
// Debug enable debug on the shim // Debug enable debug on the shim
ShimDebug bool `toml:"shim_debug,omitempty"` ShimDebug bool `toml:"shim_debug"`
} }
func New(ic *plugin.InitContext) (interface{}, error) { func New(ic *plugin.InitContext) (interface{}, error) {

2
services/diff/service.go
View File

@ -19,7 +19,7 @@ type config struct {
// respected for which is choosen. Each differ should return the same // respected for which is choosen. Each differ should return the same
// correct output, allowing any ordering to be used to prefer // correct output, allowing any ordering to be used to prefer
// more optimimal implementations. // more optimimal implementations.
Order []string `toml:"default,omitempty"` Order []string `toml:"default"`
} }
func init() { func init() {