Merge lp:~kubernetes/charms/trusty/etcd/trunk into lp:charms/trusty/etcd
Proposed by
Charles Butler
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 16 | ||||||||
Proposed branch: | lp:~kubernetes/charms/trusty/etcd/trunk | ||||||||
Merge into: | lp:charms/trusty/etcd | ||||||||
Diff against target: |
23 lines (+2/-2) 2 files modified
config.yaml (+1/-1) hooks/hooks.py (+1/-1) |
||||||||
To merge this branch: | bzr merge lp:~kubernetes/charms/trusty/etcd/trunk | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi (community) | Approve | ||
Review via email: mp+265870@code.launchpad.net |
Description of the change
This is a complete rename of a config option predicated by bug:
https:/
the `source` option collides with an option of similar name in the openstack charms.
To post a comment you must log in.
LGTM