← Back to branch summary

~cmars/juju-core/charm-owner-scope

~cmars/juju-core/charm-owner-scope

Viewing all changes in revision 2284.

Committer: Casey Marshall
Date: 2014-02-01 16:27:34 UTC
mfrom: (2282.1.6 juju-core)
Revision ID: cmars@cmarstech.com-20140201162734-sat01rs46f018fci

Merged from tip, up to 1.17.3.

files renamed:
provider/null/ => provider/manual/

files modified:
cmd/juju/bootstrap.go

cmd/jujud/machine.go

cmd/plugins/juju-metadata/imagemetadata.go

cmd/plugins/juju-metadata/signmetadata.go

cmd/plugins/juju-metadata/toolsmetadata.go

cmd/plugins/juju-metadata/toolsmetadata_test.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/config.go

environs/config/config.go

environs/config/config_test.go

environs/config_test.go

environs/storage/storage_test.go

environs/tools/urls_test.go

log/syslog/config.go

log/syslog/config_test.go

provider/all/all.go

provider/dummy/storage.go

provider/local/environ.go

provider/manual/config.go

provider/manual/config_test.go

provider/manual/environ.go

provider/manual/environ_test.go

provider/manual/export_test.go

provider/manual/instance.go

provider/manual/provider.go

provider/manual/provider_test.go

provider/manual/suite_test.go

provider/provider.go

scripts/win-installer/setup.iss

state/apiserver/charms.go

state/apiserver/charms_test.go

state/machine.go

utils/ssh/ssh_openssh.go

utils/ssh/ssh_test.go

version/version.go

Show diffs side-by-side

added added

removed removed

cmd/juju/bootstrap.go

cmd/jujud/machine.go

cmd/plugins/juju-metadata/imagemetadata.go

cmd/plugins/juju-metadata/signmetadata.go

cmd/plugins/juju-metadata/toolsmetadata.go

cmd/plugins/juju-metadata/toolsmetadata_test.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/config.go

environs/config/config.go

environs/config/config_test.go

environs/config_test.go

environs/storage/storage_test.go

environs/tools/urls_test.go

log/syslog/config.go

log/syslog/config_test.go

provider/all/all.go

provider/dummy/storage.go

provider/local/environ.go

provider/manual/config.go

provider/manual/config_test.go

provider/manual/environ.go

provider/manual/environ_test.go

provider/manual/export_test.go

provider/manual/instance.go

provider/manual/provider.go

provider/manual/provider_test.go

provider/manual/suite_test.go

provider/provider.go

scripts/win-installer/setup.iss

state/apiserver/charms.go

state/apiserver/charms_test.go

state/machine.go

utils/ssh/ssh_openssh.go

utils/ssh/ssh_test.go

version/version.go

Older »