← Back to branch summary

~juju/juju-core/1.10

~juju/juju-core/1.10

Viewing all changes in revision 1061.6.2.

Committer: William Reade
Date: 2013-04-01 14:39:22 UTC
mfrom: (1084 juju-core)
mto: This revision was merged to the branch mainline in revision 1085.
Revision ID: fwereade@gmail.com-20130401143922-4gz7lkj8i85k9wn6

merge reparent

files added:
state/statecmd/addrelation.go

state/statecmd/addrelation_test.go

files modified:
cmd/builddb/main.go

cmd/juju/addrelation.go

cmd/juju/destroyrelation.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/jujud/agent.go

cmd/jujud/agent_test.go

cmd/jujud/bootstrap.go

cmd/jujud/bootstrap_test.go

cmd/jujud/deploy_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/jujud/unit.go

cmd/jujud/unit_test.go

cmd/jujud/upgrade.go

cmd/jujud/upgrade_test.go

doc/api.txt

environs/agent/agent.go

environs/agent/agent_test.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/dummy/environs.go

environs/ec2/local_test.go

environs/openstack/local_test.go

environs/openstack/provider.go

juju/api.go

juju/conn.go

juju/testing/conn.go

state/annotator.go

state/api/apiclient.go

state/api/client.go

state/api/params/params.go

state/api/params/params_test.go

state/apiserver/api_test.go

state/apiserver/apiserver.go

state/assign_test.go

state/charm_test.go

state/conn_test.go

state/environ.go

state/environ_test.go

state/export_test.go

state/machine.go

state/machine_test.go

state/megawatcher_internal_test.go

state/open.go

state/relation_test.go

state/service.go

state/service_test.go

state/state.go

state/state_test.go

state/statecmd/destroyrelation.go

state/statecmd/destroyrelation_test.go

state/statecmd/resolved.go

state/unit.go

state/unit_test.go

state/user.go

state/user_test.go

state/watcher.go

worker/deployer/deployer.go

worker/deployer/deployer_test.go

worker/deployer/export_test.go

worker/deployer/simple.go

worker/deployer/simple_test.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_test.go

worker/uniter/uniter.go

worker/uniter/uniter_test.go

Show diffs side-by-side

added added

removed removed

cmd/builddb/main.go

cmd/juju/addrelation.go

cmd/juju/destroyrelation.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/jujud/agent.go

cmd/jujud/agent_test.go

cmd/jujud/bootstrap.go

cmd/jujud/bootstrap_test.go

cmd/jujud/deploy_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/jujud/unit.go

cmd/jujud/unit_test.go

cmd/jujud/upgrade.go

cmd/jujud/upgrade_test.go

environs/agent/agent.go

environs/agent/agent_test.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/dummy/environs.go

environs/ec2/local_test.go

environs/openstack/local_test.go

environs/openstack/provider.go

juju/testing/conn.go

state/annotator.go

state/api/apiclient.go

state/api/client.go

state/api/params/params.go

state/api/params/params_test.go

state/apiserver/api_test.go

state/apiserver/apiserver.go

state/assign_test.go

state/charm_test.go

state/conn_test.go

state/environ.go

state/environ_test.go

state/export_test.go

state/machine.go

state/machine_test.go

state/megawatcher_internal_test.go

state/relation_test.go

state/service.go

state/service_test.go

state/state_test.go

state/statecmd/addrelation.go

state/statecmd/addrelation_test.go

state/statecmd/destroyrelation.go

state/statecmd/destroyrelation_test.go

state/statecmd/resolved.go

state/unit_test.go

state/user_test.go

state/watcher.go

worker/deployer/deployer.go

worker/deployer/deployer_test.go

worker/deployer/export_test.go

worker/deployer/simple.go

worker/deployer/simple_test.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_test.go

worker/uniter/uniter.go

worker/uniter/uniter_test.go

Older »