Merge lp://staging/~wallyworld/juju-core/watcher-address-issues-trunk into lp://staging/~go-bot/juju-core/trunk
Proposed by
Ian Booth
| Status: | Merged |
|---|---|
| Approved by: | Ian Booth |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2562 |
| Proposed branch: | lp://staging/~wallyworld/juju-core/watcher-address-issues-trunk |
| Merge into: | lp://staging/~go-bot/juju-core/trunk |
| Diff against target: |
152 lines (+77/-19) 3 files modified
state/machine.go (+16/-11) state/megawatcher.go (+25/-8) state/megawatcher_internal_test.go (+36/-0) |
| To merge this branch: | bzr merge lp://staging/~wallyworld/juju-core/watcher-address-issues-trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Engineering | Pending | ||
|
Review via email:
|
|||
Commit message
Port changes from 1.18 which address bug 1301464
Change the internals of the megawatcher to ensure
that machine addresses are correct and that the
public and private addresses for untis come from
the assigned machine.
Description of the change
Port changes from 1.18 which address bug 1301464
Change the internals of the megawatcher to ensure
that machine addresses are correct and that the
public and private addresses for untis come from
the assigned machine.
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
