lp:~rogpeppe/juju-core/323-machineagent-api-client

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~go-bot/juju-core/trunk at revision 1317

Tim Penhey (community): Approve on 2013-06-20

Diff: 255 lines (+37/-49)

7 files modified

cmd/jujud/machine_test.go (+3/-6)
state/api/machiner/machine.go (+6/-6)
state/api/machiner/machiner.go (+11/-10)
state/api/machiner/machiner_test.go (+9/-10)
state/api/state.go (+4/-13)
state/apiserver/login_test.go (+2/-2)
state/apiserver/server_test.go (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1313. By Roger Peppe on 2013-06-23

merge trunk

1312. By Roger Peppe on 2013-06-21

merge trunk

1311. By Roger Peppe on 2013-06-20

state/apiserver: fix tests

1310. By Roger Peppe on 2013-06-19

gofmt

1309. By Roger Peppe on 2013-06-19

state/api/machiner: rename Machiner to State

1308. By Roger Peppe on 2013-06-19

merge trunk

1307. By William Reade on 2013-06-19

[r=fwereade],[bug=1129319] charm: local repos follow symlinks in series dirs

fixes lp:1129319

https://codereview.appspot.com/10302043/

1306. By Roger Peppe on 2013-06-19

[r=rogpeppe] state/machine: new agent API

As discussed, for testing reasons it makes sense to
place APIs for a given agent alongside one another,
so this CL puts the machiner API and the machine agent
API alongside one another.

Client-side machine agent API in a subsequent CL.

Re-proposing to avoid the prereq, which I can't
submit right now.
Original CL here: https://codereview.appspot.com/10398043/

https://codereview.appspot.com/10384046/

1305. By Roger Peppe on 2013-06-19

[r=rogpeppe] runner: fix possible shutdown deadlocks

When the runner was shutting down, it ignored
requests, which could cause deadlocks in some cases.

[reproposal of https://codereview.appspot.com/9770043/]

https://codereview.appspot.com/10401044/

1304. By William Reade on 2013-06-19

[r=fwereade] state: some watcher testing consistency

Not great -- especially the duplication in watcher_test.go -- but rather
better than what was there before, I think.

And I think I've killed all the crazy-table-style watcher tests now, so
that's a bonus.

https://codereview.appspot.com/10251047/