Affected files:
A [revision details]
M cmd/juju/ssh.go
M cmd/juju/ssh_test.go
M cmd/juju/status.go
M cmd/jujud/bootstrap_test.go
M environs/azure/environ.go
M environs/azure/environprovider.go
M environs/azure/instance.go
M environs/dummy/environs.go
M environs/ec2/ec2.go
M environs/ec2/export_test.go
M environs/ec2/live_test.go
M environs/ec2/local_test.go
M environs/ec2/state.go
M environs/interface.go
M environs/jujutest/livetests.go
M environs/jujutest/tests.go
M environs/maas/environ.go
M environs/maas/environ_test.go
M environs/maas/environprovider.go
M environs/maas/environprovider_test.go
M environs/maas/instance.go
M environs/maas/state.go
M environs/maas/util.go
M environs/maas/util_test.go
M environs/openstack/export_test.go
M environs/openstack/local_test.go
M environs/openstack/provider.go
M environs/openstack/state.go
M instance/instance.go
M state/apiserver/api_test.go
M state/machine.go
M state/machine_test.go
M state/megawatcher_internal_test.go
M state/state.go
M state/state_test.go
M worker/firewaller/firewaller.go
M worker/provisioner/provisioner_task.go
M worker/provisioner/provisioner_test.go
Reviewers: mp+169709_ code.launchpad. net,
Message:
Please take a look.
Description:
Move state.InstanceId to instance.Id
Very mechanical change, just imports, and occasional variable renames.
https:/ /code.launchpad .net/~thumper/ juju-core/ instance- id/+merge/ 169709
Requires: /code.launchpad .net/~thumper/ juju-core/ lxc-cloud- init/+merge/ 169328
https:/
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/10325043/
Affected files: ssh_test. go bootstrap_ test.go azure/environ. go azure/environpr ovider. go azure/instance. go dummy/environs. go ec2/export_ test.go ec2/live_ test.go ec2/local_ test.go ec2/state. go interface. go jujutest/ livetests. go jujutest/ tests.go maas/environ. go maas/environ_ test.go maas/environpro vider.go maas/environpro vider_test. go maas/instance. go maas/state. go maas/util. go maas/util_ test.go openstack/ export_ test.go openstack/ local_test. go openstack/ provider. go openstack/ state.go instance. go /api_test. go test.go er_internal_ test.go firewaller/ firewaller. go provisioner/ provisioner_ task.go provisioner/ provisioner_ test.go
A [revision details]
M cmd/juju/ssh.go
M cmd/juju/
M cmd/juju/status.go
M cmd/jujud/
M environs/
M environs/
M environs/
M environs/
M environs/ec2/ec2.go
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M instance/
M state/apiserver
M state/machine.go
M state/machine_
M state/megawatch
M state/state.go
M state/state_test.go
M worker/
M worker/
M worker/