Created by Casey Marshall on 2014-04-09 and last modified on 2014-04-09
Get this branch:
bzr branch lp:~cmars/juju-core/1.18-local-repo-errmsg
Only Casey Marshall can upload to this branch. If you are Casey Marshall please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Casey Marshall

Recent revisions

2265. By Casey Marshall on 2014-04-09

Error msg for local charm deploy missing series.

Add error message when unable to resolve series for local repository.
Update juju deploy doc message to describe behavior.

2264. By John A Meinel on 2014-04-09

[r=jameinel],[bug=1299802] worker/upgrader: Refuse to downgrade

We've always considered the possibility of rolling back an upgrade with
"juju upgrade-juju --version=$OLD", however we never actually
implemented downgrade logic. And the new upgrade steps aren't actually
reversible. Bug #1299802 happened because 1.18 changes some state on
disk vs 1.16. It also has a race condition during upgrade where a 1.16
Unit agent upgrades faster than its Machine agent. When the API server
is 1.18, it will tell the Unit agent that it should actually match its
Machine agent version, thereby causing it to try to downgrade back to
1.16. What that actually does is just roll back to the 1.16 tools which
are now incompatible with the 1.18 agent.conf file.

Since we don't actually support rollback of upgrades, this just changes
the upgrader to refuse to change version to something older than


2263. By Curtis Hovey on 2014-04-07

[r=jameinel] Increment juju stable to 1.18.1.

Increment juju stable version and win installer to 1.18.1.


2262. By Curtis Hovey on 2014-04-04

[r=sinzui] Update juju to stable to 1.18.0.

Update juju version and win installer to 1.18.0.


2261. By Ian Booth on 2014-04-04

[r=fwereade],[bug=1302313] A handful of unit tests which call bootstrap or functions which upload tools failed if the Juju version is a release number eg 1.18. This is because those tests did not first explicitly upload tools and auto upload for release tools is not allowed.

The affected tests patch the version.Current variable to change the version to a dev release.

Also, changes were made to allow release tools be uploaded (a version.Dev() check is removed). Tested live with EC2.

2260. By Casey Marshall on 2014-04-04

[r=sinzui] 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.

2259. By Casey Marshall on 2014-04-04

[r=sinzui] Ported r2560 from trunk to 1.18

Add series: attribute to charm metadata.

Allows charms to declare a preferred series. The field is optional, but if
set, it must be a valid series identifier, using the same criteria as a charm

2258. By Jason Hobbs on 2014-04-04

[r=jameinel] Fix architecture name for armhf.

juju-tools for arm 32-bit all use "armhf" as the arch name; juju-core should
use it too, rather than "arm".

2257. By Ian Booth on 2014-04-03

[r=wallyworld],[bug=1301464] Ensure unit addresses populated

Change the internals of the megawatcher to ensure
that machine addresses are correct and that the
public and private addresses for untis come from
the assigned machine.

2256. By John A Meinel on 2014-04-02

[r=jameinel],[bug=1300321] cloudinit: always install curl

Our cloud images always come with curl installed, but manual instances may
not (bug #1300321). It doesn't hurt to install a package that is already
there, so this is a trivial patch to just depend on having curl installed.


Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.