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

..

bundles

Chaning the bundle to use the new config value.

2015-05-28 13:40:25 -05:00

charms/trusty

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

2015-05-29 17:36:48 -05:00

prereqs

Make copyright ownership statement generic

2015-05-01 17:49:56 -04:00

return-node-ips.py

Fixing the permissions on python files.

2015-05-14 15:02:22 -05:00

util.sh

Adding kube-down logic to utils.sh to clean up.

2015-05-28 16:58:55 -05:00