lp:~juju/juju-core/trunk

Created by Gustavo Niemeyer on 2012-06-01 and last modified on 2013-06-14
Get this branch:
bzr branch lp:~juju/juju-core/trunk
Members of Juju Engineering can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Juju Engineering
Project:
juju-core
Status:
Merged

Recent revisions

1279. By Madison Scott-Clary on 2013-06-14

Add UpgradeCharm to the API

This branch adds upgrade charm functionality to the API (branch 3/3 in the process).

R=fwereade, mue
CC=
https://codereview.appspot.com/10237043

1278. By Tim Penhey on 2013-06-13

Update the validMachine regex for containers

Yay regex.

R=wallyworld, fwereade
CC=
https://codereview.appspot.com/10215043

1277. By William Reade on 2013-06-12

deploy refactoring

GUI deploy and CLI deploy are different enough that the common statecmd
caused more problems than it solved. Testing is noticeably improved.

juju.Conn.DeployService and juju.Conn.AddUnits are now probably ready to
move to some other place that just requires a state connection (and not
an environment as well); juju.Conn.PutCharm needs some love too, and
thought devoted to how we're going to put local charms over the API.

But, for now, the various bits all happen in the right place (*except* that
the CLI once again downloads store charms and uploads them itself, rather
than taking advantage of that functionality on the server side. This can
and will be fixed, but not this CL).

R=rog, jameinel, mue
CC=
https://codereview.appspot.com/10166044

1276. By William Reade on 2013-06-12

state: Service ConfigSettings methods

Config, SetConfig, and SetConfigYAML methods have been dropped in favour of
ConfigSettings and UpdateConfigSettings, which use sensible types. Clients
are expected to parse their own damn data and supply a sensible format.

R=mue, rog
CC=
https://codereview.appspot.com/10083047

1274. By William Reade on 2013-06-12

state: Unit.WatchConfigSettings

state.Settings is bad, because it allows any client the ability to
read/change the associated document without any sort of validation;
and sending them down a channel is independently bad because the
documents don't contain the right data for the unit context.

So, I just made it an EntityWatcher instead. Works just as well, is
rather simpler, doesn't expose massive potential bugs. Win!

R=thumper, wallyworld, rog
CC=
https://codereview.appspot.com/10180043

1273. By Ian Booth on 2013-06-12

Add ParentId() to Machine

This branch provides the ability to ask a container for its parent machine's id.

R=thumper, fwereade
CC=
https://codereview.appspot.com/10203043

1272. By William Reade on 2013-06-12

state: Unit.ConfigSettings

Better name, better type; suitable changes propagated amongst clients.

R=thumper, wallyworld, rog
CC=
https://codereview.appspot.com/10169044

1271. By William Reade on 2013-06-11

charm: trivial error consistency tweak

expect followup changing charm package to use errors.NotFoundError

R=thumper, wallyworld, rog
CC=
https://codereview.appspot.com/10178043

1270. By Ian Booth on 2013-06-11

Fix machine tag for containers

Container ids can't be used in file names since they contain "/".
Replace the "/" with a "-".

R=thumper
CC=
https://codereview.appspot.com/10019049

Branch metadata

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