← Back to branch summary

~arosales/juju-core/update-azure-boilerplate

~arosales/juju-core/update-azure-boilerplate

Viewing all changes in revision 1245.8.11.

Committer: Martin Packman
Date: 2013-06-20 11:03:10 UTC
mfrom: (1311 trunk)
mto: (1287.5.6 327-apiserver-factor-out-client) (1324.1.1 330-apiserver-resource-get)
mto: This revision was merged to the branch mainline in revision 1326.
Revision ID: martin.packman@canonical.com-20130620110310-2so6xpx213yawtmw

Merge trunk to resolve conflicts with machiner to machine package rename

files added:
environs/azure

environs/azure/azure_test.go

environs/azure/certfile.go

environs/azure/certfile_test.go

environs/azure/config.go

environs/azure/config_test.go

environs/azure/environ.go

environs/azure/environ_test.go

environs/azure/environprovider.go

environs/azure/instance.go

environs/azure/storage.go

instance

instance/instance.go

state/apiserver/machine/agent.go

state/apiserver/machine/agent_test.go

state/apiserver/machine/common_test.go

state/apiserver/testing

state/container.go

state/watcher_test.go

testing/checkers/bool.go

testing/checkers/bool_test.go

testing/checkers/checker_test.go

testing/checkers/file.go

testing/checkers/file_test.go

testing/checkers/relop.go

testing/checkers/relop_test.go

worker/cleaner

worker/cleaner/cleaner.go

worker/cleaner/cleaner_test.go

worker/provisioner/broker.go

worker/provisioner/environ_broker.go

worker/provisioner/provisioner_task.go

files removed:
state/statecmd/deploy.go

state/statecmd/deploy_test.go

files renamed:
state/apiserver/machiner/ => state/apiserver/machine/

files modified:
.lbox.check

Makefile

README

charm/charm_test.go

charm/config.go

charm/config_test.go

charm/repo.go

charm/repo_test.go

cmd/builddb/main.go

cmd/juju/addmachine.go

cmd/juju/addmachine_test.go

cmd/juju/bootstrap_test.go

cmd/juju/cmd_test.go

cmd/juju/config_test.go

cmd/juju/deploy.go

cmd/juju/deploy_test.go

cmd/juju/main_test.go

cmd/juju/plugin_test.go

cmd/juju/set.go

cmd/juju/ssh.go

cmd/juju/ssh_test.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/juju/synctools.go

cmd/juju/synctools_test.go

cmd/juju/upgradecharm_test.go

cmd/jujud/bootstrap.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/logging.go

cmd/logging_test.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/config/config.go

environs/config/config_test.go

environs/dummy/environs.go

environs/dummy/storage.go

environs/ec2/ec2.go

environs/ec2/export_test.go

environs/ec2/image_test.go

environs/ec2/live_test.go

environs/ec2/local_test.go

environs/ec2/state.go

environs/instances/image.go

environs/instances/image_test.go

environs/interface.go

environs/jujutest/livetests.go

environs/jujutest/tests.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/state.go

environs/maas/util.go

environs/maas/util_test.go

environs/openstack/export_test.go

environs/openstack/local_test.go

environs/openstack/provider.go

environs/openstack/provider_test.go

environs/openstack/state.go

environs/storage.go

environs/storage_test.go

juju/api.go

juju/conn.go

juju/conn_test.go

juju/testing/conn.go

log/log.go

rpc/jsoncodec/codec.go

rpc/jsoncodec/codec_test.go

rpc/jsoncodec/conn.go

rpc/rpc_test.go

rpc/server.go

state/annotator.go

state/api/apiclient.go

state/api/client.go

state/api/machiner/machiner_test.go

state/api/params/params.go

state/api/params/params_test.go

state/apiserver/api_test.go

state/apiserver/apiserver.go

state/apiserver/client.go

state/apiserver/client_test.go

state/apiserver/common/interfaces.go

state/apiserver/login_test.go

state/apiserver/machine/machiner.go

state/apiserver/machine/machiner_test.go

state/apiserver/perm_test.go

state/apiserver/root.go

state/apiserver/server_test.go

state/assign_test.go

state/constraints.go

state/export_test.go

state/initialize_test.go

state/machine.go

state/machine_test.go

state/megawatcher_internal_test.go

state/open.go

state/relation.go

state/relationunit.go

state/relationunit_test.go

state/service.go

state/service_test.go

state/settings.go

state/state.go

state/state_test.go

state/statecmd/config_test.go

state/statecmd/get.go

state/unit.go

state/unit_test.go

state/user.go

state/watcher.go

state/watcher/watcher.go

state/watcher/watcher_test.go

testing/charm.go

testing/environ.go

testing/log.go

testing/mgo.go

utils/password.go

worker/firewaller/firewaller.go

worker/firewaller/firewaller_test.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_test.go

worker/runner.go

worker/runner_test.go

worker/uniter/context.go

worker/uniter/context_test.go

worker/uniter/filter.go

worker/uniter/filter_test.go

worker/uniter/jujuc/config-get.go

worker/uniter/jujuc/context.go

worker/uniter/jujuc/juju-log_test.go

worker/uniter/jujuc/util_test.go

worker/uniter/modes.go

worker/uniter/uniter_test.go

Show diffs side-by-side

added added

removed removed

charm/charm_test.go

charm/config.go

charm/config_test.go

charm/repo_test.go

cmd/builddb/main.go

cmd/juju/addmachine.go

cmd/juju/addmachine_test.go

cmd/juju/bootstrap_test.go

cmd/juju/cmd_test.go

cmd/juju/config_test.go

cmd/juju/deploy.go

cmd/juju/deploy_test.go

cmd/juju/main_test.go

cmd/juju/plugin_test.go

cmd/juju/set.go

cmd/juju/ssh.go

cmd/juju/ssh_test.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/juju/synctools.go

cmd/juju/synctools_test.go

cmd/juju/upgradecharm_test.go

cmd/jujud/bootstrap.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/logging_test.go

environs/azure/

environs/azure/azure_test.go

environs/azure/certfile.go

environs/azure/certfile_test.go

environs/azure/config.go

environs/azure/config_test.go

environs/azure/environ.go

environs/azure/environ_test.go

environs/azure/environprovider.go

environs/azure/instance.go

environs/azure/storage.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/config/config.go

environs/config/config_test.go

environs/dummy/environs.go

environs/dummy/storage.go

environs/ec2/ec2.go

environs/ec2/export_test.go

environs/ec2/image_test.go

environs/ec2/live_test.go

environs/ec2/local_test.go

environs/ec2/state.go

environs/instances/image.go

environs/instances/image_test.go

environs/interface.go

environs/jujutest/livetests.go

environs/jujutest/tests.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/state.go

environs/maas/util.go

environs/maas/util_test.go

environs/openstack/export_test.go

environs/openstack/local_test.go

environs/openstack/provider.go

environs/openstack/provider_test.go

environs/openstack/state.go

environs/storage.go

environs/storage_test.go

instance/instance.go

juju/conn_test.go

juju/testing/conn.go

rpc/jsoncodec/codec.go

rpc/jsoncodec/codec_test.go

rpc/jsoncodec/conn.go

rpc/rpc_test.go

state/annotator.go

state/api/apiclient.go

state/api/client.go

state/api/machiner/machiner_test.go

state/api/params/params.go

state/api/params/params_test.go

state/apiserver/api_test.go

state/apiserver/apiserver.go

state/apiserver/client.go

state/apiserver/client_test.go

state/apiserver/common/interfaces.go

state/apiserver/login_test.go

state/apiserver/machine/agent.go

state/apiserver/machine/agent_test.go

state/apiserver/machine/common_test.go

state/apiserver/machine/machiner.go

state/apiserver/machine/machiner_test.go

state/apiserver/perm_test.go

state/apiserver/root.go

state/apiserver/server_test.go

state/apiserver/testing/

state/assign_test.go

state/constraints.go

state/container.go

state/export_test.go

state/initialize_test.go

state/machine.go

state/machine_test.go

state/megawatcher_internal_test.go

state/relation.go

state/relationunit.go

state/relationunit_test.go

state/service.go

state/service_test.go

state/settings.go

state/state_test.go

state/statecmd/config_test.go

state/statecmd/deploy.go

state/statecmd/deploy_test.go

state/statecmd/get.go

state/unit_test.go

state/watcher.go

state/watcher/watcher.go

state/watcher/watcher_test.go

state/watcher_test.go

testing/charm.go

testing/checkers/bool.go

testing/checkers/bool_test.go

testing/checkers/checker_test.go

testing/checkers/file.go

testing/checkers/file_test.go

testing/checkers/relop.go

testing/checkers/relop_test.go

testing/environ.go

utils/password.go

worker/cleaner/

worker/cleaner/cleaner.go

worker/cleaner/cleaner_test.go

worker/firewaller/firewaller.go

worker/firewaller/firewaller_test.go

worker/provisioner/broker.go

worker/provisioner/environ_broker.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_task.go

worker/provisioner/provisioner_test.go

worker/runner.go

worker/runner_test.go

worker/uniter/context.go

worker/uniter/context_test.go

worker/uniter/filter.go

worker/uniter/filter_test.go

worker/uniter/jujuc/config-get.go

worker/uniter/jujuc/context.go

worker/uniter/jujuc/juju-log_test.go

worker/uniter/jujuc/util_test.go

worker/uniter/modes.go

worker/uniter/uniter_test.go

Older »