Merge lp://staging/~gary/juju-core/more-info into lp://staging/~juju/juju-core/trunk
Status: | Merged |
---|---|
Approved by: | William Reade |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1089 |
Proposed branch: | lp://staging/~gary/juju-core/more-info |
Merge into: | lp://staging/~juju/juju-core/trunk |
Diff against target: |
2502 lines (+407/-341) 29 files modified
cmd/builddb/main.go (+4/-3) cmd/juju/resolved_test.go (+9/-9) cmd/juju/status.go (+4/-3) cmd/juju/status_test.go (+4/-3) cmd/jujud/unit_test.go (+4/-3) environs/dummy/environs.go (+13/-12) environs/ec2/ec2.go (+12/-11) environs/interface.go (+7/-6) environs/jujutest/livetests.go (+25/-24) environs/openstack/provider.go (+11/-10) juju/conn.go (+3/-3) juju/conn_test.go (+4/-3) state/api/params/params.go (+43/-2) state/api/params/params_test.go (+21/-1) state/apiserver/api_test.go (+2/-2) state/machine_test.go (+5/-4) state/megawatcher_internal_test.go (+21/-5) state/service.go (+2/-1) state/state_test.go (+5/-4) state/statecmd/resolved.go (+3/-3) state/statecmd/resolved_test.go (+4/-4) state/unit.go (+20/-51) state/unit_test.go (+49/-48) worker/firewaller/firewaller.go (+18/-17) worker/firewaller/firewaller_test.go (+35/-34) worker/uniter/filter.go (+9/-8) worker/uniter/filter_test.go (+8/-7) worker/uniter/modes.go (+8/-7) worker/uniter/uniter_test.go (+54/-53) |
To merge this branch: | bzr merge lp://staging/~gary/juju-core/more-info |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email:
|
Description of the change
Expose more delta information
This exposes more unit attributes to the watchers. The only true additions in this branch are to the params.go file, and the associated test. After this change, much more (but unfortunately still not all) of the values we need will be exposed in the watcher.
The branch is very large because of mechanical changes that prevent circular imports. UnitStatus, Port, and ResolvedMode needed to move into the params package, and this required a very large number of mechanical import changes. The rest of the changes in this branch, other than some test fix-ups in megawatcher_
Reviewers: mp+156406_ code.launchpad. net,
Message:
Please take a look.
Description:
Expose more delta information
This exposes more unit attributes to the watchers. The only true
additions in this branch are to the params.go file, and the associated
test. After this change, much more (but unfortunately still not all) of
the values we need will be exposed in the watcher.
The branch is very large because of mechanical changes that prevent internal_ test.go, are just
circular imports. UnitStatus, Port, and ResolvedMode needed to move
into the params package, and this required a very large number of
mechanical import changes. The rest of the changes in this branch,
other than some test fix-ups in megawatcher_
these mechanical changes to handle the new location.
https:/ /code.launchpad .net/~gary/ juju-core/ more-info/ +merge/ 156406
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/8086045/
Affected files: resolved_ test.go status_ test.go unit_test. go dummy/environs. go interface. go jujutest/ livetests. go openstack/ provider. go params/ params. go params/ params_ test.go /api_test. go test.go er_internal_ test.go resolved. go resolved_ test.go firewaller/ firewaller. go firewaller/ firewaller_ test.go uniter/ filter. go uniter/ filter_ test.go uniter/ modes.go uniter/ uniter_ test.go
A [revision details]
M cmd/builddb/main.go
M cmd/juju/
M cmd/juju/status.go
M cmd/juju/
M cmd/jujud/
M environs/
M environs/ec2/ec2.go
M environs/
M environs/
M environs/
M juju/conn.go
M juju/conn_test.go
M state/api/
M state/api/
M state/apiserver
M state/machine_
M state/megawatch
M state/service.go
M state/state_test.go
M state/statecmd/
M state/statecmd/
M state/unit.go
M state/unit_test.go
M worker/
M worker/
M worker/
M worker/
M worker/
M worker/