lp:~natefinch/juju-core/014-fix-windows-build
- Get this branch:
- bzr branch lp:~natefinch/juju-core/014-fix-windows-build
Branch merges
- Juju Engineering: Pending requested
-
Diff: 1767 lines (+1262/-59)22 files modifiedenvirons/config/authkeys.go (+6/-3)
juju/conn.go (+4/-6)
juju/conn_test.go (+5/-4)
juju/osenv/package_test.go (+12/-0)
juju/osenv/vars.go (+37/-0)
juju/osenv/vars_linux.go (+18/-0)
juju/osenv/vars_linux_test.go (+14/-0)
juju/osenv/vars_test.go (+0/-20)
juju/osenv/vars_windows.go (+26/-0)
juju/osenv/vars_windows_test.go (+33/-0)
juju/testing/conn.go (+4/-3)
provider/ec2/config_test.go (+4/-3)
provider/local/config_test.go (+3/-2)
provider/local/environ.go (+1/-1)
scripts/win-installer/LICENCE.txt (+661/-0)
scripts/win-installer/README.txt (+133/-0)
scripts/win-installer/modpath.iss (+219/-0)
scripts/win-installer/setup.iss (+63/-0)
testing/environ.go (+5/-4)
testing/environ_test.go (+7/-6)
utils/file.go (+3/-2)
utils/file_test.go (+4/-5)
- Juju Engineering: Pending requested
-
Diff: 12703 lines (+3169/-3958) (has conflicts)155 files modifiedagent/agent.go (+195/-61)
charm/export_test.go (+7/-1)
cmd/export_test.go (+7/-4)
cmd/juju/bootstrap.go (+2/-9)
cmd/juju/bootstrap_test.go (+10/-14)
cmd/juju/main.go (+0/-4)
cmd/juju/upgradejuju.go (+1/-1)
cmd/juju/upgradejuju_test.go (+1/-1)
cmd/jujud/agent.go (+14/-2)
cmd/jujud/deploy_test.go (+4/-10)
cmd/jujud/machine.go (+23/-9)
cmd/jujud/machine_test.go (+2/-8)
cmd/jujud/unit.go (+23/-1)
cmd/plugins/juju-metadata/metadata.go (+0/-1)
cmd/plugins/juju-metadata/metadataplugin_test.go (+0/-1)
cmd/plugins/juju-metadata/validateimagemetadata.go (+15/-0)
cmd/plugins/juju-metadata/validatetoolsmetadata.go (+36/-24)
cmd/plugins/juju-metadata/validatetoolsmetadata_test.go (+1/-53)
dependencies.tsv (+2/-2)
environs/bootstrap/bootstrap.go (+1/-24)
environs/bootstrap/bootstrap_test.go (+27/-25)
environs/cloudinit/cloudinit.go (+2/-2)
environs/imagemetadata/simplestreams.go (+13/-6)
environs/imagemetadata/simplestreams_test.go (+20/-6)
environs/imagemetadata/urls.go (+17/-0)
environs/imagemetadata/validation.go (+1/-1)
environs/imagemetadata/validation_test.go (+11/-1)
environs/instances/image_test.go (+5/-1)
environs/interface.go (+11/-0)
environs/jujutest/livetests.go (+24/-1)
environs/jujutest/tests.go (+10/-1)
environs/localstorage/storage.go (+0/-6)
environs/localstorage/storage_test.go (+0/-9)
environs/manual/agent.go (+5/-5)
environs/manual/provisioner.go (+0/-2)
environs/manual/provisioner_test.go (+2/-2)
environs/open_test.go (+1/-4)
environs/simplestreams/export_test.go (+0/-11)
environs/simplestreams/json.go (+0/-57)
environs/simplestreams/json_test.go (+0/-34)
environs/simplestreams/simplestreams.go (+70/-71)
environs/simplestreams/simplestreams_test.go (+1/-20)
environs/simplestreams/testing/testing.go (+21/-77)
environs/sync/sync.go (+136/-1)
environs/sync/sync_test.go (+5/-4)
environs/testing/tools.go (+3/-218)
environs/tools/boilerplate.go (+15/-16)
environs/tools/legacytools.go (+0/-40)
environs/tools/marshal.go (+0/-92)
environs/tools/marshal_test.go (+0/-161)
environs/tools/simplestreams.go (+64/-33)
environs/tools/simplestreams_test.go (+70/-154)
environs/tools/storage.go (+6/-7)
environs/tools/storage_test.go (+100/-18)
environs/tools/suite_test.go (+0/-16)
environs/tools/tools.go (+98/-23)
environs/tools/tools_test.go (+387/-152)
environs/tools/urls.go (+17/-0)
environs/tools/validation.go (+16/-3)
environs/tools/validation_test.go (+16/-3)
instance/address_test.go (+0/-117)
juju/apiconn_test.go (+0/-8)
juju/conn_test.go (+12/-10)
juju/testing/conn.go (+0/-4)
names/relation.go (+13/-15)
names/relation_test.go (+12/-12)
names/tag.go (+2/-3)
names/tag_test.go (+6/-2)
provider/azure/environ.go (+7/-10)
provider/azure/instance.go (+32/-73)
provider/azure/instance_test.go (+2/-47)
provider/azure/instancetype.go (+1/-1)
provider/azure/instancetype_test.go (+1/-1)
provider/ec2/ec2.go (+11/-15)
provider/ec2/image.go (+1/-1)
provider/ec2/local_test.go (+3/-0)
provider/export_test.go (+17/-4)
provider/instance.go (+1/-5)
provider/local/environ.go (+11/-9)
provider/local/environprovider.go (+1/-1)
provider/maas/maas_test.go (+0/-3)
provider/openstack/image.go (+1/-1)
provider/openstack/local_test.go (+11/-2)
provider/openstack/provider.go (+28/-12)
provider/provider.go (+1/-1)
scripts/build-release-tarball/build-release-tarball.bash (+1/-1)
scripts/win-installer/setup.iss (+65/-1)
state/api/agent/machine_test.go (+9/-1)
state/api/apiclient.go (+0/-3)
state/api/deployer/deployer_test.go (+15/-0)
state/api/machiner/machiner_test.go (+11/-1)
state/api/params/internal.go (+2/-55)
state/api/state.go (+2/-6)
state/api/uniter/charm.go (+25/-4)
state/api/uniter/environ.go (+6/-17)
state/api/uniter/environ_test.go (+0/-32)
state/api/uniter/export_test.go (+0/-5)
state/api/uniter/relation.go (+22/-31)
state/api/uniter/relationunit.go (+32/-100)
state/api/uniter/service.go (+22/-70)
state/api/uniter/service_test.go (+0/-120)
state/api/uniter/settings.go (+16/-69)
state/api/uniter/settings_test.go (+0/-133)
state/api/uniter/unit.go (+61/-237)
state/api/uniter/uniter.go (+30/-87)
state/api/uniter/uniter_test.go (+134/-17)
state/api/upgrader/upgrader_test.go (+17/-0)
state/api/watcher/interfaces.go (+0/-12)
state/api/watcher/watcher.go (+0/-59)
state/api/watcher/watcher_test.go (+24/-0)
state/apiserver/pinger_test.go (+43/-14)
state/apiserver/root.go (+0/-18)
state/apiserver/server_test.go (+2/-4)
state/apiserver/uniter/uniter.go (+82/-197)
state/apiserver/uniter/uniter_test.go (+102/-232)
state/apiserver/upgrader/upgrader.go (+6/-1)
state/apiserver/watcher.go (+0/-30)
state/export_test.go (+3/-1)
state/relation.go (+1/-1)
state/relationunit_test.go (+190/-128)
state/state.go (+7/-1)
state/state_test.go (+4/-4)
state/testing/watcher.go (+17/-105)
state/unit.go (+9/-0)
state/watcher.go (+36/-30)
store/export_test.go (+7/-1)
testing/checkers/checker.go (+17/-5)
testing/checkers/set.go (+35/-0)
testing/checkers/set_test.go (+54/-0)
testing/environ.go (+19/-0)
utils/file.go (+11/-0)
version/export_test.go (+3/-1)
version/version.go (+1/-1)
worker/deployer/deployer.go (+13/-12)
worker/deployer/deployer_test.go (+33/-12)
worker/deployer/export_test.go (+3/-6)
worker/deployer/simple.go (+28/-21)
worker/deployer/simple_test.go (+4/-7)
worker/machiner/machiner.go (+6/-2)
worker/machiner/machiner_test.go (+17/-29)
worker/uniter/charm/deployer.go (+7/-23)
worker/uniter/charm/deployer_test.go (+6/-35)
worker/uniter/charm/export_test.go (+0/-14)
worker/uniter/context.go (+8/-4)
worker/uniter/context_test.go (+15/-0)
worker/uniter/hook/hook.go (+6/-0)
worker/uniter/modes.go (+15/-0)
worker/uniter/relation/hookqueue.go (+19/-5)
worker/uniter/relation/hookqueue_test.go (+68/-45)
worker/uniter/relationer.go (+1/-0)
worker/uniter/relationer_test.go (+34/-0)
worker/uniter/state.go (+7/-0)
worker/uniter/state_test.go (+7/-0)
worker/upgrader/upgrader.go (+10/-10)
worker/upgrader/upgrader_test.go (+27/-28)
Branch information
Recent revisions
- 1743. By Dave Cheney <email address hidden>
-
[r=dave-cheney] Switch the 1.14 release tarball script to use the 1.14 series.
- 1742. By Roger Peppe
-
[r=rogpeppe] environs/jujutest: fix test for Prepare
This is a backport to 1.14 of a fix that is already in trunk.
- 1741. By Roger Peppe
-
[r=rogpeppe],[bug=1220027] cmd/jujud: avoid using allFatal
This is a backport of the https:/
/code.launchpad .net/~rogpeppe/ juju-core/ 384-avoid- allfatal/ +merge/ 184743
now proposed for 1.14, with selected other patches from other revisions
to make it compile. - 1739. By Tim Penhey
-
Add a string method for MAAS instance.
Backports r1777 from lp:juju-core, and fixes bug 1222664.
- 1738. By Andrew Wilkins
-
provider/azure: backport #1218329 fix
Update boilerplate environment.yaml to use
released precise images on Windows Azure. - 1737. By Roger Peppe
-
[r=rogpeppe] environs/bootstrap: enable and fix tests
As jameinel suggests, it would be nice if go test
at least printed a question mark when there
are no tests to run.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~go-bot/juju-core/trunk