← Back to branch summary

~mfoord/juju-core/refresh-session

~mfoord/juju-core/refresh-session

Viewing all changes in revision 2754.

Committer: Michael Foord
Date: 2014-06-02 09:37:16 UTC
mfrom: (2745.23.42 juju-core)
Revision ID: michael.foord@canonical.com-20140602093716-m4bl3pbpse8ezvyw

Merge

files added:
charm/actions.go

charm/actions_test.go

files modified:
agent/agent.go

agent/agent_test.go

cmd/jujud/agent_test.go

dependencies.tsv

environs/instances/instancetype.go

environs/instances/instancetype_test.go

environs/testing/tools.go

provider/ec2/image_test.go

state/api/apiclient.go

state/api/apiclient_test.go

Show diffs side-by-side

added added

removed removed

agent/agent_test.go

charm/actions.go

charm/actions_test.go

cmd/jujud/agent_test.go

dependencies.tsv

environs/instances/instancetype.go

environs/instances/instancetype_test.go

environs/testing/tools.go

provider/ec2/image_test.go

state/api/apiclient.go

state/api/apiclient_test.go

Older »