← Back to branch summary

~jameinel/juju-core/api-registry-tracks-type

~jameinel/juju-core/api-registry-tracks-type

« back to all changes in this revision

Viewing changes to environs/all/

Committer: Tim Penhey
Date: 2013-04-14 22:34:39 UTC
mfrom: (1151.1.1 trivial-becomes-utils)
mto: (1142.3.14 use-string-set)
mto: This revision was merged to the branch mainline in revision 1153.
Revision ID: tim.penhey@canonical.com-20130414223439-pkuv2x3pwjli13vw

Merge trunk and resolve conflicts.

files added:
environs/all

environs/all/all.go

environs/maas

environs/maas/config.go

environs/maas/config_test.go

environs/maas/environ.go

environs/maas/environ_test.go

environs/maas/environprovider.go

environs/maas/environprovider_test.go

environs/maas/instance.go

environs/maas/instance_test.go

environs/maas/maas_test.go

environs/maas/state.go

environs/maas/state_test.go

environs/maas/storage.go

environs/maas/storage_test.go

environs/maas/util.go

environs/maas/util_test.go

environs/storage.go

environs/storage_test.go

environs/tools/build.go

environs/tools/export_test.go

environs/tools/storage.go

environs/tools/storage_test.go

files removed:
utils

files renamed:
trivial/ => utils/

utils/set/ => utils/set/

files modified:
cmd/builddb/main.go

cmd/cmd.go

cmd/juju/bootstrap.go

cmd/juju/main.go

cmd/juju/main_test.go

cmd/juju/publish.go

cmd/juju/resolved_test.go

cmd/juju/ssh.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/juju/synctools.go

cmd/juju/synctools_test.go

cmd/juju/upgradejuju.go

cmd/juju/upgradejuju_test.go

cmd/jujud/agent.go

cmd/jujud/agent_test.go

cmd/jujud/bootstrap.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/jujud/main.go

cmd/jujud/unit.go

cmd/jujud/unit_test.go

cmd/jujud/upgrade.go

cmd/jujud/upgrade_test.go

cmd/logging.go

cmd/logging_test.go

cmd/supercommand.go

cmd/supercommand_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/ec2.go

environs/ec2/export_test.go

environs/ec2/live_test.go

environs/ec2/local_test.go

environs/export_test.go

environs/interface.go

environs/jujutest/livetests.go

environs/jujutest/tests.go

environs/mongo.go

environs/mongo_test.go

environs/openstack/export_test.go

environs/openstack/live_test.go

environs/openstack/local_test.go

environs/openstack/provider.go

environs/testing/tools.go

environs/tools.go

environs/tools/list.go

environs/tools_test.go

juju/conn.go

juju/conn_test.go

scripts/stresstest/run.sh

state/annotator.go

state/api/client.go

state/api/params/params.go

state/api/params/params_test.go

state/api/params/status.go

state/apiserver/api_test.go

state/apiserver/apiserver.go

state/constraints.go

state/machine.go

state/machine_test.go

state/megawatcher.go

state/megawatcher_internal_test.go

state/open.go

state/relation.go

state/relationunit.go

state/service.go

state/state.go

state/status.go

state/unit.go

state/unit_test.go

state/user.go

state/user_test.go

testing/mgo.go

utils/attempt.go

utils/password.go

utils/timeit.go

utils/trivial.go

utils/trivial_test.go

utils/uuid.go

utils/uuid_test.go

worker/deployer/deployer.go

worker/machiner/machiner.go

worker/machiner/machiner_test.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_test.go

worker/uniter/charm/charm.go

worker/uniter/charm/git.go

worker/uniter/context_test.go

worker/uniter/filter_test.go

worker/uniter/modes.go

worker/uniter/relation/relation.go

worker/uniter/state.go

worker/uniter/state_test.go

worker/uniter/uniter.go

worker/uniter/uniter_test.go

Show diffs side-by-side

added added

removed removed

Older »