Merge pull request kubernetes#5075 from thockin/fix_inline

Fix VolumeSource inline in JSON
duda · Mar 5, 2015 · feb98ca · feb98ca
2 parents 4f12f4f + 4cb4682
commit feb98ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -158,7 +158,7 @@ type Volume struct {
 	// The VolumeSource represents the location and type of a volume to mount.
 	// This is optional for now. If not specified, the Volume is implied to be an EmptyDir.
 	// This implied behavior is deprecated and will be removed in a future version.
-	VolumeSource `json:"inline,omitempty"`
+	VolumeSource `json:",inline,omitempty"`
 }
 
 // VolumeSource represents the source location of a volume to mount.

diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go
@@ -177,7 +177,7 @@ type Volume struct {
 	// Source represents the location and type of a volume to mount.
 	// This is optional for now. If not specified, the Volume is implied to be an EmptyDir.
 	// This implied behavior is deprecated and will be removed in a future version.
-	VolumeSource `json:"inline,omitempty"`
+	VolumeSource `json:",inline,omitempty"`
 }
 
 // VolumeSource represents the source location of a valume to mount.