Merge lp:~bbaqar/charms/trusty/plumgrid-gateway/ext-interface-static into lp:~junaidali/charms/trusty/plumgrid-gateway/trunk
Proposed by
Junaid Ali
Status: | Merged |
---|---|
Merged at revision: | 32 |
Proposed branch: | lp:~bbaqar/charms/trusty/plumgrid-gateway/ext-interface-static |
Merge into: | lp:~junaidali/charms/trusty/plumgrid-gateway/trunk |
Diff against target: |
47 lines (+10/-16) (has conflicts) 2 files modified
hooks/pg_gw_utils.py (+6/-16) templates/kilo/ifcs.conf (+4/-0) Text conflict in templates/kilo/ifcs.conf |
To merge this branch: | bzr merge lp:~bbaqar/charms/trusty/plumgrid-gateway/ext-interface-static |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Junaid Ali | Pending | ||
Review via email: mp+296969@code.launchpad.net |
To post a comment you must log in.