Merge pull request #17614 from bprashanth/IngressE2E

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-30 20:16:17 -08:00
5 changed files with 319 additions and 46 deletions

View File

@@ -112,7 +112,7 @@ readonly KUBE_CLIENT_PLATFORMS=(
# arbitrary, but is a reasonable splitting point for 2015
# laptops-versus-not.
#
# If you are using boot2docker, the following seems to work (note
# If you are using boot2docker, the following seems to work (note
# that 12000 rounds to 11G):
# boot2docker down
# VBoxManage modifyvm boot2docker-vm --memory 12000