lp://staging/~fwereade/pyjuju/use-ubuntu-series

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/pyjuju

Gustavo Niemeyer: Needs Information on 2011-09-21

Kapil Thangavelu (community): Approve on 2011-09-21

Jim Baker: Pending requested 2011-09-20

Diff: 720 lines (+173/-38)

28 files modified

juju/agents/base.py (+1/-1)
juju/agents/provision.py (+5/-2)
juju/agents/tests/test_provision.py (+7/-2)
juju/control/bootstrap.py (+3/-1)
juju/control/initialize.py (+6/-1)
juju/control/tests/test_bootstrap.py (+36/-4)
juju/control/tests/test_initialize.py (+1/-1)
juju/providers/common/base.py (+2/-2)
juju/providers/common/bootstrap.py (+13/-7)
juju/providers/common/cloudinit.py (+12/-4)
juju/providers/common/launch.py (+1/-0)
juju/providers/common/tests/data/cloud_init_bootstrap (+1/-1)
juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers (+1/-1)
juju/providers/common/tests/test_cloudinit.py (+2/-1)
juju/providers/common/tests/test_utils.py (+15/-1)
juju/providers/common/utils.py (+9/-0)
juju/providers/dummy.py (+1/-1)
juju/providers/ec2/tests/common.py (+6/-0)
juju/providers/ec2/tests/data/bootstrap_cloud_init (+1/-1)
juju/providers/ec2/tests/test_bootstrap.py (+6/-3)
juju/providers/orchestra/__init__.py (+3/-1)
juju/providers/orchestra/tests/common.py (+6/-0)
juju/providers/orchestra/tests/data/bootstrap_user_data (+1/-1)
juju/providers/orchestra/tests/test_bootstrap.py (+4/-0)
juju/state/environment.py (+6/-0)
juju/state/initialize.py (+7/-1)
juju/state/tests/test_environment.py (+11/-0)
juju/state/tests/test_initialize.py (+6/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

354. By William Reade on 2011-09-21

merge trunk

353. By William Reade on 2011-09-20

tested (barely) get_local_series

352. By William Reade on 2011-09-20

everything that passes on trunk now pases here

351. By William Reade on 2011-09-20

merge parent

350. By William Reade on 2011-09-20

store default series in environment

349. By Gustavo Niemeyer on 2011-09-16

Merging the-big-renaming branch! Say hello to juju!

This is a massive change renaming and fixing several things
on the way. Unfortunately my day is finishing and I didn't
manage to get 100% of the tests passing, but there's very
few things broken right now, and I don't want to keep such
a massive change flying around.

We'll sort any details out tomorrow.

348. By Kapil Thangavelu on 2011-09-14

merge local-machine [r=bcsaller,fwereade,niemeyer][f=838476]

Local provider machine, effectively a constant localhost ptr.

347. By Kapil Thangavelu on 2011-09-14

merge lib-files [r=fwereade,niemeyer][f=837692]

A common provider file storage for local and dummy providers.

346. By Kapil Thangavelu on 2011-09-14

merge lib-zookeeper [r=fwereade,niemeyer][f=837601]

A zookeeper class for managing a zookeeper instance. Used by the test
runner and local provider.

345. By Benjamin Saller on 2011-09-14

Merge lxc-lib [r=kapil,niemeyer] [f=825326]\n\n\tInitial support for building lxc containers, for use in lxc provider