Merge remote-tracking branch 'upstream/master'

2015-02-06 08:16:28 +08:00
parent 492e03697f ae6e25f4af
commit 903ed06774
136 changed files with 14323 additions and 978 deletions
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -55,6 +55,7 @@ readonly KUBE_TEST_PORTABLE=(
  contrib/for-tests/network-tester/service.json
  hack/e2e.go
  hack/e2e-suite
+  hack/ginkgo-e2e.sh
 )

 # If we update this we need to also update the set of golang compilers we build