Merge pull request #836 from wking/oom-score-adj-go-tag

crosbymichael · web-flow · commit 1de23f7e4bee · 2017-05-18T10:57:17.000-07:00
specs-go/config: Add a 'linux' tag to OOMScoreAdj
diff --git a/specs-go/config.go b/specs-go/config.go
@@ -53,7 +53,7 @@ type Process struct {
 	// ApparmorProfile specifies the apparmor profile for the container.
 	ApparmorProfile string `json:"apparmorProfile,omitempty" platform:"linux"`
 	// Specify an oom_score_adj for the container.
-	OOMScoreAdj *int `json:"oomScoreAdj,omitempty"`
+	OOMScoreAdj *int `json:"oomScoreAdj,omitempty" platform:"linux"`
 	// SelinuxLabel specifies the selinux context that the container process is run as.
 	SelinuxLabel string `json:"selinuxLabel,omitempty" platform:"linux"`
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ type Process struct {`
`53`	`53`	`// ApparmorProfile specifies the apparmor profile for the container.`
`54`	`54`	ApparmorProfile string `json:"apparmorProfile,omitempty" platform:"linux"`
`55`	`55`	`// Specify an oom_score_adj for the container.`
`56`		- OOMScoreAdj *int `json:"oomScoreAdj,omitempty"`
	`56`	+ OOMScoreAdj *int `json:"oomScoreAdj,omitempty" platform:"linux"`
`57`	`57`	`// SelinuxLabel specifies the selinux context that the container process is run as.`
`58`	`58`	SelinuxLabel string `json:"selinuxLabel,omitempty" platform:"linux"`
`59`	`59`	`}`