Merge lp:~cmars/juju-core/1.18-resolve-cs-series into lp:juju-core/1.18
Status: | Merged |
---|---|
Merged at revision: | 2265 |
Proposed branch: | lp:~cmars/juju-core/1.18-resolve-cs-series |
Merge into: | lp:juju-core/1.18 |
Diff against target: |
73 lines (+20/-5) 3 files modified
cmd/juju/common.go (+8/-0) cmd/juju/deploy.go (+8/-5) provider/local/environprovider.go (+4/-0) |
To merge this branch: | bzr merge lp:~cmars/juju-core/1.18-resolve-cs-series |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+214097@code.launchpad.net |
Commit message
Ported r2559 from trunk to 1.18
For the deploy and upgradecharm commands, when a series is not provided, and a
default-series is not set in the environment config, the client will resolve
the series with the charm store, through the state server. If the client is
working with a 1.16 state server, it will resolve the series directly with the
charm store.
Existing environments will have a default-series, so they should have no
change in series selection.
New environments will continue to support the default-series config setting,
but it can be omitted, and is not set by default.
Description of the change
Ported r2559 from trunk to 1.18
For the deploy and upgradecharm commands, when a series is not provided, and a
default-series is not set in the environment config, the client will resolve
the series with the charm store, through the state server. If the client is
working with a 1.16 state server, it will resolve the series directly with the
charm store.
Existing environments will have a default-series, so they should have no
change in series selection.
New environments will continue to support the default-series config setting,
but it can be omitted, and is not set by default.
Reviewers: mp+214097_ code.launchpad. net,
Message:
Please take a look.
Description:
Ported r2559 from trunk to 1.18
For the deploy and upgradecharm commands, when a series is not provided,
and a
default-series is not set in the environment config, the client will
resolve
the series with the charm store, through the state server. If the client
is
working with a 1.16 state server, it will resolve the series directly
with the
charm store.
Existing environments will have a default-series, so they should have no
change in series selection.
New environments will continue to support the default-series config
setting,
but it can be omitted, and is not set by default.
https:/ /code.launchpad .net/~cmars/ juju-core/ 1.18-resolve- cs-series/ +merge/ 214097
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/84190043/
Affected files (+448, -150 lines): addmachine. go bootstrap_ test.go environment_ test.go upgradecharm. go upgradejuju_ test.go juju-metadata/ imagemetadata. go juju-metadata/ imagemetadata_ test.go bootstrap/ bootstrap_ test.go bootstrap/ synctools. go config/ config. go config/ config_ test.go jujutest/ livetests. go testing/ tools.go test.go conn.go instance. go azure/environ_ test.go common/ bootstrap. go dummy/environs. go ec2/live_ test.go ec2/local_ test.go joyent/ environ. go openstack/ provider. go params/ params. go /client/ client. go /client/ client_ test.go provisioner/ container_ initialisation_ test.go provisioner/ kvm-broker_ test.go provisioner/ lxc-broker_ test.go provisioner/ provisioner_ test.go
A [revision details]
M charm/charm.go
M charm/charm_test.go
M charm/url.go
M charm/url_test.go
M cmd/juju/
M cmd/juju/
M cmd/juju/common.go
M cmd/juju/deploy.go
M cmd/juju/
M cmd/juju/publish.go
M cmd/juju/
M cmd/juju/
M cmd/plugins/
M cmd/plugins/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M juju/apiconn_
M juju/testing/
M juju/testing/
M provider/
M provider/
M provider/
M provider/ec2/ec2.go
M provider/
M provider/
M provider/
M provider/
M state/api/client.go
M state/api/
M state/apiserver
M state/apiserver
M testing/environ.go
M worker/
M worker/
M worker/
M worker/