Merge lp://staging/~rogpeppe/juju-core/305-jujud-use-tasks-package into lp://staging/~juju/juju-core/trunk

Proposed by Roger Peppe
Status: Work in progress
Proposed branch: lp://staging/~rogpeppe/juju-core/305-jujud-use-tasks-package
Merge into: lp://staging/~juju/juju-core/trunk
Prerequisite: lp://staging/~rogpeppe/juju-core/315-api-dialopts
Diff against target: 1062 lines (+300/-412)
12 files modified
cmd/jujud/agent.go (+102/-96)
cmd/jujud/agent_test.go (+2/-144)
cmd/jujud/machine.go (+108/-115)
cmd/jujud/machine_test.go (+24/-12)
cmd/jujud/unit.go (+33/-27)
cmd/jujud/upgrade.go (+0/-10)
environs/agent/agent.go (+7/-0)
state/api/params/params.go (+6/-0)
state/apiserver/apiserver.go (+11/-1)
state/life.go (+6/-5)
state/state_test.go (+0/-1)
worker/runner.go (+1/-1)
To merge this branch: bzr merge lp://staging/~rogpeppe/juju-core/305-jujud-use-tasks-package
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+165746@code.staging.launchpad.net

Description of the change

cmd/jujud: connect to API

We refactor the agents to use worker.Runner,
which leads to some simplification.

https://codereview.appspot.com/9735045/

To post a comment you must log in.
Revision history for this message
William Reade (fwereade) wrote :

This is lovely. Can't wait to see it finished and proposed.

https://codereview.appspot.com/9735045/diff/1/cmd/jujud/machine.go
File cmd/jujud/machine.go (right):

https://codereview.appspot.com/9735045/diff/1/cmd/jujud/machine.go#newcode79
cmd/jujud/machine.go:79: if a.MachineId == "0" {
Please use the constant in state, not "0" :).

https://codereview.appspot.com/9735045/

Unmerged revisions

1241. By Roger Peppe

gofmt

1240. By Roger Peppe

cmd/jujud: use longer delay dialling api

1239. By Roger Peppe

merge 305-jujud-use-tasks-package

1238. By Roger Peppe

fix stuff

1237. By Roger Peppe

merge 314-worker-fix-runner-deadlock

1236. By Roger Peppe

wip

1235. By Roger Peppe

Merged 313-jsoncodec-optional-log into 305-jujud-use-tasks-package.

1234. By Roger Peppe

wip

1233. By Roger Peppe

cmd/jujud: new stuff now compiles

1232. By Roger Peppe

Merged 312-api-jobs into 305-jujud-use-tasks-package.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches