From b17e343afc352d6171eb59de40396f8d0f59f7c6 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Thu, 28 May 2015 16:00:10 -0700
Subject: [PATCH] Fix undetected merge conflict

---
 test/e2e/networking.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/networking.go b/test/e2e/networking.go
index e5c7dc9d9ca..39ba3a35613 100644
--- 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,
 			},
 		})