Merge pull request #12470 from simon3z/add-host-ipc

Auto commit by PR queue bot
2015-09-21 09:15:01 -07:00
parent 9f93dceab1 f21d9ac9e4
commit 843134885e
22 changed files with 107 additions and 19 deletions
--- a/pkg/api/deep_copy_generated.go
+++ b/pkg/api/deep_copy_generated.go
@@ -1488,6 +1488,7 @@ func deepCopy_api_PodSpec(in PodSpec, out *PodSpec, c *conversion.Cloner) error
 	out.NodeName = in.NodeName
 	out.HostNetwork = in.HostNetwork
 	out.HostPID = in.HostPID
+	out.HostIPC = in.HostIPC
 	if in.ImagePullSecrets != nil {
 		out.ImagePullSecrets = make([]LocalObjectReference, len(in.ImagePullSecrets))
 		for i := range in.ImagePullSecrets {