lp://staging/~fwereade/juju-core/jujud-integrate-cleaner-resumer

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/~go-bot/juju-core/trunk

Juju Engineering: Pending requested 2013-06-21

Diff: 680 lines (+279/-198)

6 files modified

cmd/jujud/agent.go (+8/-6)
cmd/jujud/agent_test.go (+189/-4)
cmd/jujud/machine.go (+11/-6)
cmd/jujud/machine_test.go (+67/-178)
cmd/jujud/unit.go (+3/-3)
environs/testing/storage.go (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1318. By William Reade on 2013-06-21

go fmt :/

1317. By William Reade on 2013-06-21

merge parent

1316. By William Reade on 2013-06-21

machine agent with JobManageState now runs Cleaner, Resumer; also, more unity testing for machine agent

1315. By William Reade on 2013-06-21

merge parent

1314. By William Reade on 2013-06-21

update tests to take short-circuited unit removal into account

1313. By William Reade on 2013-06-21

address review

1312. By William Reade on 2013-06-21

go fmt

1311. By William Reade on 2013-06-21

merge parent

1310. By William Reade on 2013-06-21

gate unit quick-destroy on unit status != pending

1309. By William Reade on 2013-06-19

[r=fwereade],[bug=1175031] uniter: don't repeat change events

By putting the unit.ClearResolved onto the filter goroutine, and immediately
forcing unit-change handling, we can ensure that the uniter goroutine cannot
request a fresh resolved event before the filter has refreshed the unit and
determined that there is no event to deliver.

Handling this race should fix lp:1175031.

https://codereview.appspot.com/10298043/