Merge lp:~lazypower/charms/trusty/etcd/bump-to-seven into lp:charms/trusty/etcd
Proposed by
Charles Butler
Status: | Rejected |
---|---|
Rejected by: | Charles Butler |
Proposed branch: | lp:~lazypower/charms/trusty/etcd/bump-to-seven |
Merge into: | lp:charms/trusty/etcd |
Diff against target: |
33 lines (+11/-0) (has conflicts) 2 files modified
hooks/client-relation-changed (+6/-0) hooks/client-relation-joined (+5/-0) Text conflict in hooks/client-relation-changed Text conflict in hooks/client-relation-joined |
To merge this branch: | bzr merge lp:~lazypower/charms/trusty/etcd/bump-to-seven |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+286565@code.launchpad.net |
Description of the change
Missed a /g on the original sed that landed in etcd-6
This patches that behavior
To post a comment you must log in.
Unmerged revisions
- 21. By Charles Butler
-
Patch rev-6 to replace all instances of 7001 with 4001