openshift/origin — pull request #330 by deads2k (2014-11-04 15:03:20+00:00)
Title: rebase kubernetes for demo

@derekwaynecarr @jwforres This is the existing kubernetes, plus a cherry-pick of https://github.com/GoogleCloudPlatform/kubernetes/pull/2074, https://github.com/GoogleCloudPlatform/kubernetes/pull/1941, and https://github.com/GoogleCloudPlatform/kubernetes/pull/2140 which are needed for the demo to work properly. In particular, https://github.com/GoogleCloudPlatform/kubernetes/pull/2140 is needed for https://github.com/openshift/origin/pull/309.