Merge branch 'master' into master

.travis.yml

@@ -1,7 +1,16 @@
 language: go
 go:
-  - 1.6
+  - 1.6.2
 
 # Don't want default ./... here:
-install: go get -t -v ./test
-script: go test -v ./test
+install:
+- export PATH=$GOPATH/bin:$PATH
+- mkdir -p $HOME/gopath/src/k8s.io
+- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/kubernetes.github.io
+- go get -t -v k8s.io/kubernetes.github.io/test
+- git clone --depth=50 --branch=master https://github.com/kubernetes/md-check $HOME/gopath/src/k8s.io/md-check
+- go get -t -v k8s.io/md-check
+
+script:
+- go test -v k8s.io/kubernetes.github.io/test
+- $GOPATH/bin/md-check --root-dir=$HOME/gopath/src/k8s.io/kubernetes.github.io

docs/admin/cluster-large.md

@@ -10,9 +10,9 @@ assignees:
 
 At {{page.version}}, Kubernetes supports clusters with up to 1000 nodes. More specifically, we support configurations that meet *all* of the following criteria:
 
-* No more than 1000 nodes
-* No more than 30000 total pods
-* No more than 60000 total containers
+* No more than 2000 nodes
+* No more than 60000 total pods
+* No more than 120000 total containers
 * No more than 100 pods per node
 
 * TOC