Merge pull request #476 from hqhq/hq_embed_resource

Embed Resources for backward compatibility
2016-01-19 14:59:39 -08:00 · 2016-01-19 14:59:39 -08:00 · e91b055623
parent 5637f38b8a f048eaf87a
commit e91b055623
1 changed files with 1 additions and 1 deletions
--- 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 {