Merge lp://staging/~lazypower/charms/trusty/flannel-docker/patch_etcd_rest_script into lp://staging/charms/trusty/flannel-docker
Proposed by
Charles Butler
| Status: | Rejected |
|---|---|
| Rejected by: | Charles Butler |
| Proposed branch: | lp://staging/~lazypower/charms/trusty/flannel-docker/patch_etcd_rest_script |
| Merge into: | lp://staging/charms/trusty/flannel-docker |
| Diff against target: |
94 lines (+24/-18) 4 files modified
playbooks/flannel-configuration.yaml (+1/-1) playbooks/install-or-upgrade.yaml (+1/-1) scripts/etcd_rest.py (+20/-14) templates/upstart.template (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~lazypower/charms/trusty/flannel-docker/patch_etcd_rest_script |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Butler (community) | Disapprove | ||
|
Review via email:
|
|||
Description of the change
import v0.0.7 of flannel-docker charm
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
superceded by: https:/