kubernetes/cluster/juju/layers
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
..
kubeapi-load-balancer Add metric collection to charms for autoscalling 2017-04-13 16:02:13 -05:00
kubernetes-e2e Update kubernetes-e2e charm to use snaps 2017-04-26 10:02:01 -05:00
kubernetes-master Merge pull request #45289 from ktsakalozos/bug/fixbadrebase 2017-05-03 12:07:56 -07:00
kubernetes-worker Adds the cifs-common package 2017-04-28 13:50:05 -05:00