Kubernetes Submit Queue 8be8f90413 Merge pull request #45289 from ktsakalozos/bug/fixbadrebase ... Automatic merge from submit-queue (batch tested with PRs 45283, 45289, 45248, 44295) Remove offending code due to bad rebase **What this PR does / why we need it**: Fix bug introduced by bad rebasing **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ``` NONE ```		2017-05-03 12:07:56 -07:00
..
bundles	Merge pull request #36515 from apelisse/owners-cluster-juju	2016-12-19 14:46:43 -08:00
layers	Merge pull request #45289 from ktsakalozos/bug/fixbadrebase	2017-05-03 12:07:56 -07:00
prereqs	Update OWNERS approvers and reviewers: cluster/juju	2016-11-09 10:17:09 -08:00
.gitignore	Add metric collection to charms for autoscalling	2017-04-13 16:02:13 -05:00
OWNERS	Removing myself from Juju Owners	2017-04-18 13:25:09 -07:00
config-default.sh	…
config-test.sh	…
identify-leaders.py	Fixing identification script and adding output to ignore.	2016-08-04 19:18:07 +00:00
kube-system-ns.yaml	…
return-node-ips.py	…
util.sh	Fixing identification script and adding output to ignore.	2016-08-04 19:18:07 +00:00