Matt Bruzek e32c9e4f10 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
..
apiserver.upstart.tmpl	Add new apiserver flags for clusterIP (nee portal)	2015-05-28 16:10:44 -07:00
controller-manager.upstart.tmpl	Adding the Juju charms to the cluster directory.	2015-04-17 17:21:37 -05:00
distribution.conf.tmpl	Making the alias a variable to be replaced by the code.	2015-05-28 13:39:11 -05:00
nginx.conf.tmpl	Adding the Juju charms to the cluster directory.	2015-04-17 17:21:37 -05:00
scheduler.upstart.tmpl	Adding the Juju charms to the cluster directory.	2015-04-17 17:21:37 -05:00