← Back to branch summary

~rogpeppe/juju-core/438-local-instance-Addresses

~rogpeppe/juju-core/438-local-instance-Addresses

Viewing all changes in revision 393.1.2.

Committer: Roger Peppe
Date: 2012-08-16 11:56:56 UTC
mfrom: (381.2.1 024-jujuconnsuite-logging)
mto: (379.3.10 021-jujud-upgrader)
mto: This revision was merged to the branch mainline in revision 414.
Revision ID: roger.peppe@canonical.com-20120816115656-3pv43ls7qa4dh75j

merge 024-jujuconnsuite-logging

files added:
juju/testing

juju/testing/conn.go

files removed:
state/testing

state/testing/testing.go

files modified:
cmd/jujuc/server/context_test.go

cmd/jujuc/server/relation-ids_test.go

cmd/jujuc/server/util_test.go

cmd/jujud/bootstrap_test.go

cmd/jujud/provisioning_test.go

container/container_test.go

environs/dummy/environs.go

environs/ec2/local_test.go

juju/conn_test.go

state/assign_test.go

state/state_test.go

worker/firewaller/firewaller_test.go

worker/machiner/machiner_test.go

worker/provisioner/provisioner_test.go

worker/uniter/relationer_test.go

Show diffs side-by-side

added added

removed removed

cmd/jujuc/server/context_test.go

cmd/jujuc/server/relation-ids_test.go

cmd/jujuc/server/util_test.go

cmd/jujud/bootstrap_test.go

cmd/jujud/provisioning_test.go

container/container_test.go

environs/dummy/environs.go

environs/ec2/local_test.go

juju/conn_test.go

juju/testing/conn.go

state/assign_test.go

state/state_test.go

state/testing/testing.go

worker/firewaller/firewaller_test.go

worker/machiner/machiner_test.go

worker/provisioner/provisioner_test.go

worker/uniter/relationer_test.go

Older »