← Back to branch summary

~hduran-8/juju-core/trunk

~hduran-8/juju-core/trunk

Viewing all changes in revision 2263.3.10.

Committer: Nate Finch
Date: 2014-03-07 15:29:16 UTC
mfrom: (2387 juju-core)
mto: (2263.11.2 natefinch-030-MA-HA)
mto: This revision was merged to the branch mainline in revision 2593.
Revision ID: nate.finch@canonical.com-20140307152916-6nt3x3ff18ec1h3k

merge from trunk, fix some compilation errors after merge, fix conflicts, and fix at least one test

files added:
agent/format-1.18.go

agent/format-1.18_whitebox_test.go

agent/mongo

agent/mongo/mongo.go

agent/mongo/mongo_test.go

etc

etc/bash_completion.d

etc/bash_completion.d/juju-core

utils/zip

utils/zip/package_test.go

utils/zip/zip.go

utils/zip/zip_test.go

files removed:
agent/format-1.12.go

agent/format-1.12_whitebox_test.go

upgrades/file.go

upgrades/file_test.go

files modified:
Makefile

README

agent/agent.go

agent/agent_test.go

agent/bootstrap.go

agent/bootstrap_test.go

agent/format-1.16.go

agent/format-1.16_whitebox_test.go

agent/format.go

agent/format_whitebox_test.go

agent/tools/tools.go

charm/bundle.go

charm/bundle_test.go

charm/dir.go

charm/testing/mockstore.go

cloudinit/options.go

cloudinit/sshinit/configure.go

cloudinit/sshinit/configure_test.go

cmd/juju/help_topics.go

cmd/juju/main.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/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/main.go

cmd/jujud/run_test.go

cmd/jujud/unit.go

cmd/jujud/upgrade_test.go

cmd/logging.go

cmd/logging_test.go

cmd/plugins/juju-metadata/metadata.go

cmd/plugins/juju-metadata/signmetadata.go

cmd/plugins/juju-metadata/signmetadata_test.go

cmd/plugins/juju-metadata/toolsmetadata.go

cmd/plugins/juju-metadata/toolsmetadata_test.go

cmd/plugins/juju-restore/restore.go

cmd/plugins/local/main.go

cmd/supercommand.go

container/factory/factory.go

container/factory/factory_test.go

container/interface.go

container/kvm/kvm.go

container/kvm/kvm_test.go

container/kvm/live_test.go

container/lxc/lxc.go

container/lxc/lxc_test.go

container/userdata.go

dependencies.tsv

environs/bootstrap/bootstrap.go

environs/cloudinit.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/cloudinit_test.go

environs/config.go

environs/config/config.go

environs/config/config_test.go

environs/config_test.go

environs/configstore/disk.go

environs/imagemetadata/upload.go

environs/manual/provisioner.go

environs/simplestreams/simplestreams.go

environs/sync/sync.go

environs/testing/bootstrap.go

environs/tools/tools.go

environs/tools/tools_test.go

juju/api.go

log/log.go

log/log_test.go

log/syslog/config.go

log/syslog/config_test.go

log/syslog/testing/syslogconf.go

provider/azure/customdata_test.go

provider/azure/environprovider.go

provider/common/bootstrap.go

provider/common/bootstrap_test.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/joyent/provider.go

provider/local/environ.go

provider/local/environ_test.go

provider/local/environprovider.go

provider/local/environprovider_test.go

provider/local/prereqs.go

provider/local/prereqs_test.go

provider/maas/environprovider.go

provider/manual/environ.go

provider/openstack/config_test.go

provider/openstack/provider.go

rpc/jsoncodec/codec.go

rpc/jsoncodec/codec_test.go

rpc/server.go

state/apiserver/apiserver.go

state/apiserver/charmrevisionupdater/updater.go

state/apiserver/charms.go

state/apiserver/charms_test.go

state/apiserver/client/client.go

state/apiserver/keymanager/keymanager.go

state/apiserver/logger/logger.go

state/apiserver/login_test.go

state/apiserver/pinger_test.go

state/state.go

state/unit.go

state/watcher.go

testing/checkers/log.go

testing/checkers/log_test.go

testing/testbase/log.go

tools/tools.go

upgrades/lockdirectory_test.go

upgrades/upgrade.go

upgrades/upgrade_test.go

upstart/service.go

upstart/upstart.go

upstart/upstart_test.go

utils/apt.go

utils/exec/exec.go

utils/file.go

utils/file_test.go

utils/fslock/fslock.go

utils/network.go

utils/ssh/authorisedkeys.go

version/version.go

version/version_test.go

worker/authenticationworker/worker.go

worker/deployer/deployer.go

worker/deployer/export_test.go

worker/deployer/simple.go

worker/deployer/simple_test.go

worker/environ.go

worker/firewaller/firewaller.go

worker/instancepoller/observer_test.go

worker/instancepoller/updater.go

worker/localstorage/worker.go

worker/logger/logger.go

worker/logger/logger_test.go

worker/machineenvironmentworker/machineenvironmentworker.go

worker/machiner/machiner.go

worker/minunitsworker/minunitsworker.go

worker/minunitsworker/minunitsworker_test.go

worker/peergrouper/desired.go

worker/provisioner/container_initialisation.go

worker/provisioner/kvm-broker.go

worker/provisioner/lxc-broker.go

worker/provisioner/lxc-broker_test.go

worker/provisioner/provisioner.go

worker/resumer/resumer_test.go

worker/rsyslog/rsyslog_test.go

worker/rsyslog/worker.go

worker/uniter/context.go

worker/uniter/filter.go

worker/uniter/jujuc/juju-log.go

worker/uniter/jujuc/juju-log_test.go

worker/uniter/jujuc/server.go

worker/uniter/modes.go

worker/uniter/uniter.go

worker/upgrader/upgrader.go

Show diffs side-by-side

added added

removed removed

agent/agent_test.go

agent/bootstrap.go

agent/bootstrap_test.go

agent/format-1.12.go

agent/format-1.12_whitebox_test.go

agent/format-1.16.go

agent/format-1.16_whitebox_test.go

agent/format-1.18.go

agent/format-1.18_whitebox_test.go

agent/format.go

agent/format_whitebox_test.go

agent/mongo/mongo.go

agent/mongo/mongo_test.go

agent/tools/tools.go

charm/bundle.go

charm/bundle_test.go

charm/testing/mockstore.go

cloudinit/options.go

cloudinit/sshinit/configure.go

cloudinit/sshinit/configure_test.go

cmd/juju/help_topics.go

cmd/juju/main.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/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/main.go

cmd/jujud/run_test.go

cmd/jujud/unit.go

cmd/jujud/upgrade_test.go

cmd/logging_test.go

cmd/plugins/juju-metadata/metadata.go

cmd/plugins/juju-metadata/signmetadata.go

cmd/plugins/juju-metadata/signmetadata_test.go

cmd/plugins/juju-metadata/toolsmetadata.go

cmd/plugins/juju-metadata/toolsmetadata_test.go

cmd/plugins/juju-restore/restore.go

cmd/plugins/local/main.go

cmd/supercommand.go

container/factory/factory.go

container/factory/factory_test.go

container/interface.go

container/kvm/kvm.go

container/kvm/kvm_test.go

container/kvm/live_test.go

container/lxc/lxc.go

container/lxc/lxc_test.go

container/userdata.go

dependencies.tsv

environs/bootstrap/bootstrap.go

environs/cloudinit.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/cloudinit_test.go

environs/config.go

environs/config/config.go

environs/config/config_test.go

environs/config_test.go

environs/configstore/disk.go

environs/imagemetadata/upload.go

environs/manual/provisioner.go

environs/simplestreams/simplestreams.go

environs/sync/sync.go

environs/testing/bootstrap.go

environs/tools/tools.go

environs/tools/tools_test.go

etc/bash_completion.d/

etc/bash_completion.d/juju-core

log/log_test.go

log/syslog/config.go

log/syslog/config_test.go

log/syslog/testing/syslogconf.go

provider/azure/customdata_test.go

provider/azure/environprovider.go

provider/common/bootstrap.go

provider/common/bootstrap_test.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/joyent/provider.go

provider/local/environ.go

provider/local/environ_test.go

provider/local/environprovider.go

provider/local/environprovider_test.go

provider/local/prereqs.go

provider/local/prereqs_test.go

provider/maas/environprovider.go

provider/manual/environ.go

provider/openstack/config_test.go

provider/openstack/provider.go

rpc/jsoncodec/codec.go

rpc/jsoncodec/codec_test.go

state/apiserver/apiserver.go

state/apiserver/charmrevisionupdater/updater.go

state/apiserver/charms.go

state/apiserver/charms_test.go

state/apiserver/client/client.go

state/apiserver/keymanager/keymanager.go

state/apiserver/logger/logger.go

state/apiserver/login_test.go

state/apiserver/pinger_test.go

state/watcher.go

testing/checkers/log.go

testing/checkers/log_test.go

testing/testbase/log.go

upgrades/file.go

upgrades/file_test.go

upgrades/lockdirectory_test.go

upgrades/upgrade.go

upgrades/upgrade_test.go

upstart/service.go

upstart/upstart.go

upstart/upstart_test.go

utils/exec/exec.go

utils/file_test.go

utils/fslock/fslock.go

utils/network.go

utils/ssh/authorisedkeys.go

utils/zip/package_test.go

utils/zip/zip.go

utils/zip/zip_test.go

version/version.go

version/version_test.go

worker/authenticationworker/worker.go

worker/deployer/deployer.go

worker/deployer/export_test.go

worker/deployer/simple.go

worker/deployer/simple_test.go

worker/environ.go

worker/firewaller/firewaller.go

worker/instancepoller/observer_test.go

worker/instancepoller/updater.go

worker/localstorage/worker.go

worker/logger/logger.go

worker/logger/logger_test.go

worker/machineenvironmentworker/machineenvironmentworker.go

worker/machiner/machiner.go

worker/minunitsworker/minunitsworker.go

worker/minunitsworker/minunitsworker_test.go

worker/peergrouper/desired.go

worker/provisioner/container_initialisation.go

worker/provisioner/kvm-broker.go

worker/provisioner/lxc-broker.go

worker/provisioner/lxc-broker_test.go

worker/provisioner/provisioner.go

worker/resumer/resumer_test.go

worker/rsyslog/rsyslog_test.go

worker/rsyslog/worker.go

worker/uniter/context.go

worker/uniter/filter.go

worker/uniter/jujuc/juju-log.go

worker/uniter/jujuc/juju-log_test.go

worker/uniter/jujuc/server.go

worker/uniter/modes.go

worker/uniter/uniter.go

worker/upgrader/upgrader.go

Older »