← Back to branch summary

~rogpeppe/juju-core/324-machineagent-api-client-2

~rogpeppe/juju-core/324-machineagent-api-client-2

Viewing all changes in revision 1308.

Committer: Roger Peppe
Date: 2013-06-19 13:44:48 UTC
mfrom: (1307.1.2 trunk)
Revision ID: roger.peppe@canonical.com-20130619134448-rlb7i4x9jdz5bfj3

merge trunk

files modified:
cmd/jujud/machine_test.go

environs/jujutest/livetests.go

juju/api.go

juju/testing/conn.go

state/api/apiclient.go

state/api/machiner/machiner_test.go

state/apiserver/api_test.go

state/apiserver/login_test.go

state/apiserver/server_test.go

worker/uniter/filter.go

worker/uniter/filter_test.go

worker/uniter/modes.go

worker/uniter/uniter_test.go

Show diffs side-by-side

added added

removed removed

cmd/jujud/machine_test.go

environs/jujutest/livetests.go

juju/testing/conn.go

state/api/apiclient.go

state/api/machiner/machiner_test.go

state/apiserver/api_test.go

state/apiserver/login_test.go

state/apiserver/server_test.go

worker/uniter/filter.go

worker/uniter/filter_test.go

worker/uniter/modes.go

worker/uniter/uniter_test.go

Older »