Merge pull request #8965 from thockin/fix-build

Fix undetected merge conflict
This commit is contained in:
Tim Hockin
2015-05-28 16:01:07 -07:00

View File

@@ -60,7 +60,7 @@ func LaunchNetTestPodPerNodeNew(f *Framework, nodes *api.NodeList, name string)
Ports: []api.ContainerPort{{ContainerPort: 8080}},
},
},
Host: node.Name,
NodeName: node.Name,
RestartPolicy: api.RestartPolicyNever,
},
})