← Back to branch summary

~wallyworld/juju-core/unit-agent-knows-assigned-machine

~wallyworld/juju-core/unit-agent-knows-assigned-machine

Viewing all changes in revision 2170.1.12.

Committer: Roger Peppe
Date: 2014-01-21 19:26:14 UTC
mfrom: (2235 juju-core)
mto: This revision was merged to the branch mainline in revision 2258.
Revision ID: roger.peppe@canonical.com-20140121192614-b733zbq9now5bqo0

merge trunk

files added:
charm/testing

charm/testing/mockstore.go

cloudinit/sshinit/export_test.go

juju/osenv/proxy.go

juju/osenv/proxy_test.go

names/user_test.go

state/api/charmrevisionupdater

state/api/charmrevisionupdater/package_test.go

state/api/charmrevisionupdater/updater.go

state/api/charmrevisionupdater/updater_test.go

state/apiserver/charmrevisionupdater

state/apiserver/charmrevisionupdater/package_test.go

state/apiserver/charmrevisionupdater/testing

state/apiserver/charmrevisionupdater/testing/suite.go

state/apiserver/charmrevisionupdater/updater.go

state/apiserver/charmrevisionupdater/updater_test.go

state/apiserver/common/environmachineswatcher.go

state/apiserver/common/environmachineswatcher_test.go

state/apiserver/common/environwatcher.go

state/apiserver/common/environwatcher_test.go

state/apiserver/common/instanceidgetter.go

state/apiserver/common/instanceidgetter_test.go

state/apiserver/common/unitswatcher.go

state/apiserver/common/unitswatcher_test.go

state/apiserver/firewaller

state/apiserver/firewaller/firewaller.go

state/apiserver/firewaller/firewaller_test.go

utils/ssh/ssh_gocrypto.go

utils/ssh/ssh_gocrypto_test.go

worker/charmrevisionworker

worker/charmrevisionworker/export_test.go

worker/charmrevisionworker/revisionupdater.go

worker/charmrevisionworker/revisionupdater_test.go

worker/machiner/export_test.go

files removed:
state/apiserver/machine/agent.go

state/apiserver/machine/agent_test.go

files modified:
agent/tools/tools_test.go

charm/repo.go

charm/repo_test.go

cloudinit/sshinit/configure.go

cloudinit/sshinit/configure_test.go

cloudinit/sshinit/suite_test.go

cmd/juju/bootstrap.go

cmd/juju/bootstrap_test.go

cmd/juju/deploy.go

cmd/juju/main_test.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/juju/upgradecharm.go

cmd/jujud/agent_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/package_test.go

cmd/plugins/juju-metadata/toolsmetadata.go

cmd/plugins/juju-metadata/toolsmetadata_test.go

environs/bootstrap/bootstrap_test.go

environs/bootstrap/synctools.go

environs/config/config.go

environs/config/config_test.go

environs/manual/provisioner.go

environs/manual/provisioner_test.go

environs/sync/sync.go

environs/sync/sync_test.go

environs/testing/tools.go

environs/tools/tools_test.go

environs/tools/urls.go

environs/tools/urls_test.go

instance/instance.go

instance/instance_test.go

juju/api.go

juju/apiconn_test.go

juju/conn.go

juju/osenv/vars_test.go

names/user.go

provider/azure/instance.go

provider/azure/instance_test.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/local/environprovider.go

provider/local/environprovider_test.go

provider/openstack/provider.go

replicaset/replicaset.go

replicaset/replicaset_test.go

rpc/server.go

state/api/client.go

state/api/machiner/machine.go

state/api/machiner/machiner_test.go

state/api/params/internal.go

state/api/params/params.go

state/api/state.go

state/api/uniter/service.go

state/apiserver/admin.go

state/apiserver/apiserver.go

state/apiserver/client/client.go

state/apiserver/client/client_test.go

state/apiserver/common/interfaces.go

state/apiserver/common/setstatus.go

state/apiserver/common/setstatus_test.go

state/apiserver/deployer/deployer.go

state/apiserver/export_test.go

state/apiserver/machine/machiner.go

state/apiserver/machine/machiner_test.go

state/apiserver/pinger_test.go

state/apiserver/provisioner/provisioner.go

state/apiserver/root.go

state/apiserver/testing/errors.go

state/apiserver/uniter/uniter.go

state/charm.go

state/interface.go

state/machine.go

state/machine_test.go

state/megawatcher_internal_test.go

state/multiwatcher/multiwatcher.go

state/multiwatcher/multiwatcher_internal_test.go

state/state.go

state/state_test.go

state/statecmd/machineconfig.go

state/statecmd/status.go

state/unit.go

state/user.go

testing/charm.go

testing/mgo.go

testing/testbase/cleanup.go

testing/testbase/imports.go

utils/apt.go

utils/apt_test.go

utils/fslock/package_test.go

utils/ssh/clientkeys.go

utils/ssh/clientkeys_test.go

utils/ssh/export_test.go

utils/ssh/ssh.go

utils/ssh/ssh_openssh.go

utils/ssh/ssh_test.go

utils/sudo.go

utils/sudo_test.go

utils/trivial.go

utils/trivial_test.go

worker/firewaller/firewaller.go

worker/firewaller/firewaller_test.go

worker/machiner/machiner.go

worker/machiner/machiner_test.go

Show diffs side-by-side

added added

removed removed

agent/tools/tools_test.go

charm/repo_test.go

charm/testing/mockstore.go

cloudinit/sshinit/configure.go

cloudinit/sshinit/configure_test.go

cloudinit/sshinit/export_test.go

cloudinit/sshinit/suite_test.go

cmd/juju/bootstrap.go

cmd/juju/bootstrap_test.go

cmd/juju/deploy.go

cmd/juju/main_test.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/juju/upgradecharm.go

cmd/jujud/agent_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/package_test.go

cmd/plugins/juju-metadata/toolsmetadata.go

cmd/plugins/juju-metadata/toolsmetadata_test.go

environs/bootstrap/bootstrap_test.go

environs/bootstrap/synctools.go

environs/config/config.go

environs/config/config_test.go

environs/manual/provisioner.go

environs/manual/provisioner_test.go

environs/sync/sync.go

environs/sync/sync_test.go

environs/testing/tools.go

environs/tools/tools_test.go

environs/tools/urls.go

environs/tools/urls_test.go

instance/instance.go

instance/instance_test.go

juju/apiconn_test.go

juju/osenv/proxy.go

juju/osenv/proxy_test.go

juju/osenv/vars_test.go

names/user_test.go

provider/azure/instance.go

provider/azure/instance_test.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/local/environprovider.go

provider/local/environprovider_test.go

provider/openstack/provider.go

replicaset/replicaset.go

replicaset/replicaset_test.go

state/api/charmrevisionupdater/

state/api/charmrevisionupdater/package_test.go

state/api/charmrevisionupdater/updater.go

state/api/charmrevisionupdater/updater_test.go

state/api/client.go

state/api/machiner/machine.go

state/api/machiner/machiner_test.go

state/api/params/internal.go

state/api/params/params.go

state/api/state.go

state/api/uniter/service.go

state/apiserver/admin.go

state/apiserver/apiserver.go

state/apiserver/charmrevisionupdater/

state/apiserver/charmrevisionupdater/package_test.go

state/apiserver/charmrevisionupdater/testing/

state/apiserver/charmrevisionupdater/testing/suite.go

state/apiserver/charmrevisionupdater/updater.go

state/apiserver/charmrevisionupdater/updater_test.go

state/apiserver/client/client.go

state/apiserver/client/client_test.go

state/apiserver/common/environmachineswatcher.go

state/apiserver/common/environmachineswatcher_test.go

state/apiserver/common/environwatcher.go

state/apiserver/common/environwatcher_test.go

state/apiserver/common/instanceidgetter.go

state/apiserver/common/instanceidgetter_test.go

state/apiserver/common/interfaces.go

state/apiserver/common/setstatus.go

state/apiserver/common/setstatus_test.go

state/apiserver/common/unitswatcher.go

state/apiserver/common/unitswatcher_test.go

state/apiserver/deployer/deployer.go

state/apiserver/export_test.go

state/apiserver/firewaller/

state/apiserver/firewaller/firewaller.go

state/apiserver/firewaller/firewaller_test.go

state/apiserver/machine/agent.go

state/apiserver/machine/agent_test.go

state/apiserver/machine/machiner.go

state/apiserver/machine/machiner_test.go

state/apiserver/pinger_test.go

state/apiserver/provisioner/provisioner.go

state/apiserver/root.go

state/apiserver/testing/errors.go

state/apiserver/uniter/uniter.go

state/interface.go

state/machine.go

state/machine_test.go

state/megawatcher_internal_test.go

state/multiwatcher/multiwatcher.go

state/multiwatcher/multiwatcher_internal_test.go

state/state_test.go

state/statecmd/machineconfig.go

state/statecmd/status.go

testing/charm.go

testing/testbase/cleanup.go

testing/testbase/imports.go

utils/apt_test.go

utils/fslock/package_test.go

utils/ssh/clientkeys.go

utils/ssh/clientkeys_test.go

utils/ssh/export_test.go

utils/ssh/ssh.go

utils/ssh/ssh_gocrypto.go

utils/ssh/ssh_gocrypto_test.go

utils/ssh/ssh_openssh.go

utils/ssh/ssh_test.go

utils/sudo_test.go

utils/trivial.go

utils/trivial_test.go

worker/charmrevisionworker/

worker/charmrevisionworker/export_test.go

worker/charmrevisionworker/revisionupdater.go

worker/charmrevisionworker/revisionupdater_test.go

worker/firewaller/firewaller.go

worker/firewaller/firewaller_test.go

worker/machiner/export_test.go

worker/machiner/machiner.go

worker/machiner/machiner_test.go

Older »