Embed Resources for backward compatibility

hqhq · hqhq · commit f048eaf87a55 · 2016-01-19T19:08:14.000+08:00
Fixes: moby/moby#19329 Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
diff --git a/libcontainer/configs/cgroup_unix.go b/libcontainer/configs/cgroup_unix.go
@@ -20,7 +20,7 @@ type Cgroup struct {
 	ScopePrefix string `json:"scope_prefix"`
 
 	// Resources contains various cgroups settings to apply
-	Resources *Resources `json:"resources"`
+	*Resources
 }
 
 type Resources struct {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ type Cgroup struct {`
`20`	`20`	ScopePrefix string `json:"scope_prefix"`
`21`	`21`
`22`	`22`	`// Resources contains various cgroups settings to apply`
`23`		- Resources *Resources `json:"resources"`
	`23`	`+ *Resources`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`type Resources struct {`