lp://staging/~rogpeppe/juju-core/312-api-jobs

Branch merges

Propose for merging

1 branch dependent on this one.

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

Juju Engineering: Pending requested 2013-05-24

Diff: 1654 lines (+1071/-213)

21 files modified

cmd/jujud/bootstrap.go (+1/-1)
cmd/jujud/bootstrap_test.go (+1/-1)
cmd/jujud/machine.go (+2/-2)
cmd/jujud/machine_test.go (+4/-4)
environs/config/config_test.go (+1/-1)
environs/dummy/environs.go (+0/-3)
juju/testing/repo.go (+0/-1)
state/api/params/params.go (+30/-0)
state/apiserver/admin.go (+0/-20)
state/apiserver/apiserver.go (+750/-0)
state/apiserver/common/interfaces.go (+1/-1)
state/apiserver/login_test.go (+4/-3)
state/apiserver/machine/agent.go (+69/-0)
state/apiserver/machine/agent_test.go (+91/-0)
state/apiserver/machine/common_test.go (+66/-0)
state/apiserver/machine/machiner.go (+12/-12)
state/apiserver/machine/machiner_test.go (+9/-61)
state/apiserver/resource.go (+0/-82)
state/apiserver/root.go (+22/-13)
state/machine.go (+6/-6)
state/state_test.go (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1244. By Roger Peppe on 2013-06-18

merge 321-apiserver-machineagent-api

1243. By Roger Peppe on 2013-06-18

merge 311-juju-bootstrap-state-change-password-1.5

1242. By Roger Peppe on 2013-06-18

revert all jobs changes

1241. By Roger Peppe on 2013-06-07

gofmt

1240. By Roger Peppe on 2013-06-07

all: rename JobServeAPI to JobManageState

1239. By Roger Peppe on 2013-06-07

Merged 311-juju-bootstrap-state-change-password-1.5 into 312-api-jobs.

1238. By Roger Peppe on 2013-05-24

api: implement Machine.Jobs

1237. By Roger Peppe on 2013-05-24

merge trunk

1236. By Roger Peppe on 2013-05-24

cmd/juju: revert bogus change

1235. By Roger Peppe on 2013-05-24

cmd/jujud: change password for machine agent