Merge pull request #8965 from thockin/fix-build

Fix undetected merge conflict

Merge pull request #8965 from thockin/fix-build
d6390054 · Tim Hockin · d3551541 · b17e343a · d6390054
Commit d6390054 authored May 28, 2015 by Tim Hockin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

networking.go test/e2e/networking.go +1 -1

No files found.
--- a/test/e2e/networking.go
+++ b/test/e2e/networking.go
@@ -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,
 			},
 		})