lp://staging/~fwereade/pyjuju/rearrange-settings-nodes

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

Jim Baker: Pending requested 2011-09-21

Diff: 219 lines (+47/-36)

5 files modified

juju/agents/base.py (+5/-5)
juju/agents/tests/test_base.py (+1/-1)
juju/agents/tests/test_provision.py (+2/-0)
juju/state/environment.py (+23/-18)
juju/state/tests/test_environment.py (+16/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #855427: /global_settings node not suitable for all runtime settings

Undecided

Invalid

Link a bug report

Related blueprints

355. By William Reade on 2011-09-21

global settings now live as value nodes under /settings, instead of using /global_settings as a dict node

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.