← Back to branch summary

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

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

Viewing all changes in revision 2580.1.7.

Committer: Andrew Wilkins
Date: 2014-04-22 09:23:39 UTC
mfrom: (2660 juju-core)
mto: This revision was merged to the branch mainline in revision 2666.
Revision ID: andrew.wilkins@canonical.com-20140422092339-f4sih3li3p0tmbkd

Merge trunk

files added:
constraints/export_test.go

constraints/validation.go

constraints/validation_test.go

environs/network

environs/network/network.go

state/constraintsvalidation_test.go

worker/peergrouper/suite_test.go

worker/uniter/charm/converter.go

worker/uniter/charm/converter_test.go

worker/uniter/uniter_old_test.go

files removed:
log

log/log.go

log/log_test.go

files renamed:
log/syslog/ => utils/syslog/

files modified:
agent/bootstrap_test.go

agent/format-1.18.go

agent/mongo/mongo.go

agent/mongo/mongo_test.go

charm/charm.go

charm/dir.go

charm/dir_test.go

charm/repo.go

charm/repo_test.go

cmd/juju/bootstrap.go

cmd/juju/bootstrap_test.go

cmd/juju/common.go

cmd/juju/debuglog.go

cmd/juju/debuglog_test.go

cmd/juju/deploy_test.go

cmd/juju/destroyenvironment_test.go

cmd/juju/destroymachine_test.go

cmd/juju/endpoint.go

cmd/juju/main.go

cmd/juju/main_test.go

cmd/juju/plugin.go

cmd/juju/publish.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/jujud/agent.go

cmd/jujud/bootstrap.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/jujud/unit_test.go

constraints/constraints.go

constraints/constraints_test.go

container/kvm/container.go

container/kvm/kvm.go

container/lxc/instance.go

dependencies.tsv

downloader/downloader.go

environs/bootstrap/bootstrap.go

environs/bootstrap/bootstrap_test.go

environs/bootstrap/state.go

environs/bootstrap/synctools.go

environs/broker.go

environs/cloudinit.go

environs/cloudinit/cloudinit.go

environs/configstore/disk_test.go

environs/filestorage/filestorage.go

environs/filestorage/filestorage_test.go

environs/httpstorage/storage_test.go

environs/imagemetadata/generate.go

environs/instances/image.go

environs/instances/image_test.go

environs/interface.go

environs/jujutest/livetests.go

environs/jujutest/tests.go

environs/open.go

environs/open_test.go

environs/simplestreams/simplestreams.go

environs/sshstorage/storage.go

environs/sshstorage/storage_test.go

environs/statepolicy.go

environs/testing/tools.go

environs/tools/simplestreams.go

environs/tools/tools.go

environs/tools/tools_test.go

errors/errors.go

errors/errors_test.go

juju/api.go

juju/apiconn_test.go

juju/conn.go

juju/conn_test.go

juju/export_test.go

juju/testing/instance.go

provider/azure/certfile.go

provider/azure/environ.go

provider/azure/environ_test.go

provider/azure/instancetype.go

provider/azure/instancetype_test.go

provider/azure/storage_test.go

provider/common/bootstrap_test.go

provider/common/destroy_test.go

provider/common/mock_test.go

provider/common/state.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/ec2/image_test.go

provider/ec2/local_test.go

provider/ec2/storage.go

provider/joyent/environ.go

provider/joyent/environ_instance.go

provider/joyent/local_test.go

provider/joyent/storage.go

provider/joyent/storage_test.go

provider/local/environ.go

provider/local/environ_test.go

provider/local/instance.go

provider/maas/environ.go

provider/maas/environ_test.go

provider/maas/environ_whitebox_test.go

provider/maas/storage.go

provider/maas/storage_test.go

provider/manual/environ.go

provider/manual/environ_test.go

provider/openstack/local_test.go

provider/openstack/provider.go

provider/openstack/storage.go

rpc/rpc_test.go

state/addmachine.go

state/annotator.go

state/api/agent/machine_test.go

state/api/apiclient.go

state/api/charmrevisionupdater/updater_test.go

state/api/client.go

state/api/export_test.go

state/api/machiner/machiner_test.go

state/api/params/apierror.go

state/api/params/internal.go

state/api/provisioner/provisioner_test.go

state/api/state.go

state/api/state_test.go

state/api/uniter/relation.go

state/api/uniter/unit_test.go

state/api/upgrader/unitupgrader_test.go

state/api/upgrader/upgrader_test.go

state/api/watcher/watcher.go

state/apiserver/admin.go

state/apiserver/charmrevisionupdater/testing/suite.go

state/apiserver/charmrevisionupdater/updater.go

state/apiserver/charmrevisionupdater/updater_test.go

state/apiserver/client/api_test.go

state/apiserver/client/client.go

state/apiserver/client/client_test.go

state/apiserver/client/destroy_test.go

state/apiserver/client/status.go

state/apiserver/common/errors.go

state/apiserver/common/errors_test.go

state/apiserver/common/password.go

state/apiserver/common/resource.go

state/apiserver/deployer/deployer_test.go

state/apiserver/firewaller/firewaller_test.go

state/apiserver/keymanager/keymanager.go

state/apiserver/keyupdater/authorisedkeys.go

state/apiserver/login_test.go

state/apiserver/machine/machiner.go

state/apiserver/provisioner/provisioner.go

state/apiserver/provisioner/provisioner_test.go

state/apiserver/uniter/uniter.go

state/apiserver/uniter/uniter_test.go

state/apiserver/upgrader/unitupgrader_test.go

state/apiserver/upgrader/upgrader_test.go

state/apiserver/usermanager/usermanager.go

state/apiserver/usermanager/usermanager_test.go

state/charm_test.go

state/cleanup.go

state/cleanup_test.go

state/configvalidator_test.go

state/conn_test.go

state/constraints.go

state/environcapability_test.go

state/export_test.go

state/machine.go

state/machine_test.go

state/megawatcher.go

state/minimumunits.go

state/networkinterfaces.go

state/networkinterfaces_test.go

state/networks.go

state/networks_test.go

state/open.go

state/policy.go

state/prechecker_test.go

state/presence/presence.go

state/relation.go

state/relation_test.go

state/relationunit.go

state/relationunit_test.go

state/service.go

state/service_test.go

state/settings_test.go

state/state.go

state/state_test.go

state/tools_test.go

state/unit.go

state/unit_test.go

state/watcher.go

state/watcher/watcher.go

store/lpad.go

store/server.go

store/store.go

testing/mgo.go

testing/testbase/log_test.go

tools/list.go

utils/syslog/config_test.go

utils/trivial.go

worker/authenticationworker/worker.go

worker/charmrevisionworker/revisionupdater.go

worker/charmrevisionworker/revisionupdater_test.go

worker/cleaner/cleaner.go

worker/deployer/deployer_test.go

worker/instancepoller/machine_test.go

worker/instancepoller/updater.go

worker/peergrouper/desired.go

worker/peergrouper/desired_test.go

worker/peergrouper/initiate.go

worker/peergrouper/initiate_test.go

worker/peergrouper/mock_test.go

worker/peergrouper/worker.go

worker/peergrouper/worker_test.go

worker/provisioner/kvm-broker.go

worker/provisioner/kvm-broker_test.go

worker/provisioner/lxc-broker.go

worker/provisioner/lxc-broker_test.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_task.go

worker/provisioner/provisioner_test.go

worker/resumer/resumer.go

worker/rsyslog/rsyslog_test.go

worker/rsyslog/worker.go

worker/runner.go

worker/singular/singular.go

worker/uniter/charm/bundles.go

worker/uniter/charm/charm_test.go

worker/uniter/charm/export_test.go

worker/uniter/charm/manifest_deployer.go

worker/uniter/charm/manifest_deployer_test.go

worker/uniter/modes.go

worker/uniter/relation/relation.go

worker/uniter/relationer_test.go

worker/uniter/state.go

worker/uniter/uniter.go

worker/uniter/uniter_test.go

worker/upgrader/upgrader_test.go

Show diffs side-by-side

added added

removed removed

agent/bootstrap_test.go

agent/format-1.18.go

agent/mongo/mongo.go

agent/mongo/mongo_test.go

charm/dir_test.go

charm/repo_test.go

cmd/juju/bootstrap.go

cmd/juju/bootstrap_test.go

cmd/juju/common.go

cmd/juju/debuglog.go

cmd/juju/debuglog_test.go

cmd/juju/deploy_test.go

cmd/juju/destroyenvironment_test.go

cmd/juju/destroymachine_test.go

cmd/juju/endpoint.go

cmd/juju/main.go

cmd/juju/main_test.go

cmd/juju/plugin.go

cmd/juju/publish.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/jujud/agent.go

cmd/jujud/bootstrap.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/jujud/unit_test.go

constraints/constraints.go

constraints/constraints_test.go

constraints/export_test.go

constraints/validation.go

constraints/validation_test.go

container/kvm/container.go

container/kvm/kvm.go

container/lxc/instance.go

dependencies.tsv

downloader/downloader.go

environs/bootstrap/bootstrap.go

environs/bootstrap/bootstrap_test.go

environs/bootstrap/state.go

environs/bootstrap/synctools.go

environs/broker.go

environs/cloudinit.go

environs/cloudinit/cloudinit.go

environs/configstore/disk_test.go

environs/filestorage/filestorage.go

environs/filestorage/filestorage_test.go

environs/httpstorage/storage_test.go

environs/imagemetadata/generate.go

environs/instances/image.go

environs/instances/image_test.go

environs/interface.go

environs/jujutest/livetests.go

environs/jujutest/tests.go

environs/network/

environs/network/network.go

environs/open.go

environs/open_test.go

environs/simplestreams/simplestreams.go

environs/sshstorage/storage.go

environs/sshstorage/storage_test.go

environs/statepolicy.go

environs/testing/tools.go

environs/tools/simplestreams.go

environs/tools/tools.go

environs/tools/tools_test.go

errors/errors.go

errors/errors_test.go

juju/apiconn_test.go

juju/conn_test.go

juju/export_test.go

juju/testing/instance.go

log/log_test.go

provider/azure/certfile.go

provider/azure/environ.go

provider/azure/environ_test.go

provider/azure/instancetype.go

provider/azure/instancetype_test.go

provider/azure/storage_test.go

provider/common/bootstrap_test.go

provider/common/destroy_test.go

provider/common/mock_test.go

provider/common/state.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/ec2/image_test.go

provider/ec2/local_test.go

provider/ec2/storage.go

provider/joyent/environ.go

provider/joyent/environ_instance.go

provider/joyent/local_test.go

provider/joyent/storage.go

provider/joyent/storage_test.go

provider/local/environ.go

provider/local/environ_test.go

provider/local/instance.go

provider/maas/environ.go

provider/maas/environ_test.go

provider/maas/environ_whitebox_test.go

provider/maas/storage.go

provider/maas/storage_test.go

provider/manual/environ.go

provider/manual/environ_test.go

provider/openstack/local_test.go

provider/openstack/provider.go

provider/openstack/storage.go

rpc/rpc_test.go

state/addmachine.go

state/annotator.go

state/api/agent/machine_test.go

state/api/apiclient.go

state/api/charmrevisionupdater/updater_test.go

state/api/client.go

state/api/export_test.go

state/api/machiner/machiner_test.go

state/api/params/apierror.go

state/api/params/internal.go

state/api/provisioner/provisioner_test.go

state/api/state.go

state/api/state_test.go

state/api/uniter/relation.go

state/api/uniter/unit_test.go

state/api/upgrader/unitupgrader_test.go

state/api/upgrader/upgrader_test.go

state/api/watcher/watcher.go

state/apiserver/admin.go

state/apiserver/charmrevisionupdater/testing/suite.go

state/apiserver/charmrevisionupdater/updater.go

state/apiserver/charmrevisionupdater/updater_test.go

state/apiserver/client/api_test.go

state/apiserver/client/client.go

state/apiserver/client/client_test.go

state/apiserver/client/destroy_test.go

state/apiserver/client/status.go

state/apiserver/common/errors.go

state/apiserver/common/errors_test.go

state/apiserver/common/password.go

state/apiserver/common/resource.go

state/apiserver/deployer/deployer_test.go

state/apiserver/firewaller/firewaller_test.go

state/apiserver/keymanager/keymanager.go

state/apiserver/keyupdater/authorisedkeys.go

state/apiserver/login_test.go

state/apiserver/machine/machiner.go

state/apiserver/provisioner/provisioner.go

state/apiserver/provisioner/provisioner_test.go

state/apiserver/uniter/uniter.go

state/apiserver/uniter/uniter_test.go

state/apiserver/upgrader/unitupgrader_test.go

state/apiserver/upgrader/upgrader_test.go

state/apiserver/usermanager/usermanager.go

state/apiserver/usermanager/usermanager_test.go

state/charm_test.go

state/cleanup.go

state/cleanup_test.go

state/configvalidator_test.go

state/conn_test.go

state/constraints.go

state/constraintsvalidation_test.go

state/environcapability_test.go

state/export_test.go

state/machine.go

state/machine_test.go

state/megawatcher.go

state/minimumunits.go

state/networkinterfaces.go

state/networkinterfaces_test.go

state/networks.go

state/networks_test.go

state/policy.go

state/prechecker_test.go

state/presence/presence.go

state/relation.go

state/relation_test.go

state/relationunit.go

state/relationunit_test.go

state/service.go

state/service_test.go

state/settings_test.go

state/state_test.go

state/tools_test.go

state/unit_test.go

state/watcher.go

state/watcher/watcher.go

store/server.go

testing/testbase/log_test.go

utils/syslog/config_test.go

utils/trivial.go

worker/authenticationworker/worker.go

worker/charmrevisionworker/revisionupdater.go

worker/charmrevisionworker/revisionupdater_test.go

worker/cleaner/cleaner.go

worker/deployer/deployer_test.go

worker/instancepoller/machine_test.go

worker/instancepoller/updater.go

worker/peergrouper/desired.go

worker/peergrouper/desired_test.go

worker/peergrouper/initiate.go

worker/peergrouper/initiate_test.go

worker/peergrouper/mock_test.go

worker/peergrouper/suite_test.go

worker/peergrouper/worker.go

worker/peergrouper/worker_test.go

worker/provisioner/kvm-broker.go

worker/provisioner/kvm-broker_test.go

worker/provisioner/lxc-broker.go

worker/provisioner/lxc-broker_test.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_task.go

worker/provisioner/provisioner_test.go

worker/resumer/resumer.go

worker/rsyslog/rsyslog_test.go

worker/rsyslog/worker.go

worker/runner.go

worker/singular/singular.go

worker/uniter/charm/bundles.go

worker/uniter/charm/charm_test.go

worker/uniter/charm/converter.go

worker/uniter/charm/converter_test.go

worker/uniter/charm/export_test.go

worker/uniter/charm/manifest_deployer.go

worker/uniter/charm/manifest_deployer_test.go

worker/uniter/modes.go

worker/uniter/relation/relation.go

worker/uniter/relationer_test.go

worker/uniter/state.go

worker/uniter/uniter.go

worker/uniter/uniter_old_test.go

worker/uniter/uniter_test.go

worker/upgrader/upgrader_test.go

Older »