Merge branch 'master' of github.com:GoogleCloudPlatform/kubernetes into build-local

Conflicts: cluster/juju/bundles/local.yaml
2015-05-29 17:36:48 -05:00
parent 774f7e3738 9184ccf24d
commit e32c9e4f10
288 changed files with 6530 additions and 3377 deletions
--- a/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl
+++ b/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl
@@ -11,7 +11,7 @@ exec /usr/local/bin/apiserver \
     --address=%(api_bind_address)s \
     --etcd_servers=%(etcd_servers)s \
     --logtostderr=true \
-     --portal_net=10.244.240.0/20
+     --service-cluster-ip-range=10.244.240.0/20