Merge lp:~thomnico/charms/precise/dns/trunk into lp:~lazypower/charms/precise/dns/trunk
Proposed by
Nicolas Thomas
Status: | Merged |
---|---|
Merged at revision: | 9 |
Proposed branch: | lp:~thomnico/charms/precise/dns/trunk |
Merge into: | lp:~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:~thomnico/charms/precise/dns/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Butler | Approve | ||
Review via email: mp+239712@code.launchpad.net |
To post a comment you must log in.
Nicolas,
Thanks so much for the MP! this looks good - i'd like to see some tests with the refactors you added to ensure I don't break support for this moving forward. Is that something you can can get put together quickly?
I had a few questions, and they are inline in the MP