Merge lp://qastaging/~thomnico/charms/precise/dns/openstack-support into lp://qastaging/~lazypower/charms/precise/dns/trunk
Proposed by
Nicolas Thomas
| Status: | Merged |
|---|---|
| Merged at revision: | 9 |
| Proposed branch: | lp://qastaging/~thomnico/charms/precise/dns/openstack-support |
| Merge into: | lp://qastaging/~lazypower/charms/precise/dns/trunk |
| Diff against target: |
208 lines (+111/-9) 9 files modified
contrib/bind/provider.py (+5/-3) contrib/bind/templates/named.conf.options.jinja2 (+22/-0) hooks/dns-client-relation-changed (+55/-0) hooks/install (+16/-0) hooks/programmable-relation-changed (+2/-2) hooks/programmable-relation-departed (+3/-3) lib/common.py (+5/-1) metadata.yaml (+2/-0) requirements.txt (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~thomnico/charms/precise/dns/openstack-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Butler | Pending | ||
|
Review via email:
|
|||
Description of the change
Fix that enable non EC2 environment (OpenStack/MAAS) to work with clearwater project.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
