lp://qastaging/~rogpeppe/juju-core/305-jujud-use-tasks-package

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://qastaging/~juju/juju-core/trunk

Juju Engineering: Pending requested 2013-05-25

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1241. By Roger Peppe on 2013-05-25

gofmt

1240. By Roger Peppe on 2013-05-25

cmd/jujud: use longer delay dialling api

1239. By Roger Peppe on 2013-05-25

merge 305-jujud-use-tasks-package

1238. By Roger Peppe on 2013-05-25

fix stuff

1237. By Roger Peppe on 2013-05-25

merge 314-worker-fix-runner-deadlock

1236. By Roger Peppe on 2013-05-25

wip

1235. By Roger Peppe on 2013-05-25

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

1234. By Roger Peppe on 2013-05-25

wip

1233. By Roger Peppe on 2013-05-24

cmd/jujud: new stuff now compiles

1232. By Roger Peppe on 2013-05-24

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