← Back to branch summary

~dave-cheney/juju-core/go-juju-short-attempt

~dave-cheney/juju-core/go-juju-short-attempt

Viewing all changes in revision 222.

Committer: Dave Cheney
Date: 2012-06-19 10:49:36 UTC
mfrom: (214.2.23 juju-core)
Revision ID: david.cheney@canonical.com-20120619104936-uw7hhmxm7mb0d648

merge from trunk

files modified:
cmd/jujud/provisioning.go

cmd/jujud/provisioning_test.go

environs/ec2/cloudinit_test.go

environs/ec2/ec2.go

state/export_test.go

state/internal_test.go

state/machine.go

state/relation.go

state/service.go

state/state.go

state/state_test.go

state/topology.go

state/unit.go

state/watcher.go

state/watcher_test.go

Show diffs side-by-side

added added

removed removed

cmd/jujud/provisioning.go

cmd/jujud/provisioning_test.go

environs/ec2/cloudinit_test.go

environs/ec2/ec2.go

state/export_test.go

state/internal_test.go

state/machine.go

state/relation.go

state/service.go

state/state_test.go

state/topology.go

state/watcher.go

state/watcher_test.go

Older »