← Back to branch summary

~wallyworld/juju-core/fast-lxc-everywhere

~wallyworld/juju-core/fast-lxc-everywhere

Viewing all changes in revision 2439.1.2.

Committer: Bodie Solomon
Date: 2014-03-20 01:23:05 UTC
mfrom: (2447 juju-core)
mto: This revision was merged to the branch mainline in revision 2459.
Revision ID: binary132@gmail.com-20140320012305-foerm9in0uqx9jrg

Merged apiAddressesKey change from trunk.

files added:
upgrades/agentconfig.go

upgrades/agentconfig_test.go

files removed:
environs/manual/testing

files renamed:
upgrades/deprecatedattributes.go => upgrades/deprecatedenvsettings.go

upgrades/deprecatedattributes_test.go => upgrades/deprecatedenvsettings_test.go

files modified:
agent/agent.go

agent/agent_test.go

agent/export_test.go

agent/mongo/mongo.go

agent/mongo/mongo_test.go

agent/tools/tools_test.go

cmd/juju/bootstrap.go

cmd/juju/bootstrap_test.go

cmd/juju/scp.go

cmd/juju/scp_test.go

cmd/juju/ssh.go

cmd/juju/ssh_test.go

cmd/juju/upgradejuju.go

cmd/jujud/machine.go

cmd/package_test.go

environs/bootstrap/bootstrap_test.go

environs/bootstrap/synctools.go

environs/broker.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/interface.go

environs/manual/init.go

environs/testing/tools.go

environs/tools/tools_test.go

juju/api.go

juju/apiconn_test.go

juju/arch/arch.go

juju/arch/arch_test.go

juju/export_test.go

juju/testing/instance.go

provider/azure/environ.go

provider/azure/environ_test.go

provider/common/bootstrap.go

provider/common/bootstrap_test.go

provider/common/mock_test.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/ec2/local_test.go

provider/joyent/environ.go

provider/local/environ.go

provider/local/environ_test.go

provider/maas/environ.go

provider/maas/environ_test.go

provider/maas/environ_whitebox_test.go

provider/manual/environ.go

provider/manual/environ_test.go

provider/openstack/local_test.go

provider/openstack/provider.go

state/address.go

state/api/apiclient.go

state/api/client.go

state/api/params/params.go

state/apiserver/client/client.go

state/apiserver/client/client_test.go

state/initialize_test.go

state/open.go

state/state_test.go

state/watcher.go

upgrades/export_test.go

upgrades/steps118.go

upgrades/steps118_test.go

upgrades/upgrade.go

upgrades/upgrade_test.go

utils/file_unix.go

utils/ssh/ssh.go

utils/ssh/ssh_openssh.go

version/version.go

worker/rsyslog/worker.go

Show diffs side-by-side

added added

removed removed

agent/agent_test.go

agent/export_test.go

agent/mongo/mongo.go

agent/mongo/mongo_test.go

agent/tools/tools_test.go

cmd/juju/bootstrap.go

cmd/juju/bootstrap_test.go

cmd/juju/scp.go

cmd/juju/scp_test.go

cmd/juju/ssh.go

cmd/juju/ssh_test.go

cmd/juju/upgradejuju.go

cmd/jujud/machine.go

cmd/package_test.go

environs/bootstrap/bootstrap_test.go

environs/bootstrap/synctools.go

environs/broker.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/interface.go

environs/manual/init.go

environs/manual/testing/

environs/testing/tools.go

environs/tools/tools_test.go

juju/apiconn_test.go

juju/arch/arch.go

juju/arch/arch_test.go

juju/export_test.go

juju/testing/instance.go

provider/azure/environ.go

provider/azure/environ_test.go

provider/common/bootstrap.go

provider/common/bootstrap_test.go

provider/common/mock_test.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/ec2/local_test.go

provider/joyent/environ.go

provider/local/environ.go

provider/local/environ_test.go

provider/maas/environ.go

provider/maas/environ_test.go

provider/maas/environ_whitebox_test.go

provider/manual/environ.go

provider/manual/environ_test.go

provider/openstack/local_test.go

provider/openstack/provider.go

state/address.go

state/api/apiclient.go

state/api/client.go

state/api/params/params.go

state/apiserver/client/client.go

state/apiserver/client/client_test.go

state/initialize_test.go

state/state_test.go

state/watcher.go

upgrades/agentconfig.go

upgrades/agentconfig_test.go

upgrades/deprecatedenvsettings.go

upgrades/deprecatedenvsettings_test.go

upgrades/export_test.go

upgrades/steps118.go

upgrades/steps118_test.go

upgrades/upgrade.go

upgrades/upgrade_test.go

utils/file_unix.go

utils/ssh/ssh.go

utils/ssh/ssh_openssh.go

version/version.go

worker/rsyslog/worker.go

Older »