lp:~fwereade/pyjuju/preflight-constraints-redux

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:pyjuju

Juju Engineering: Pending requested 2012-04-04

Diff: 718 lines (+306/-48)

18 files modified

juju/errors.py (+10/-0)
juju/machine/constraints.py (+33/-2)
juju/machine/tests/test_constraints.py (+37/-16)
juju/providers/common/base.py (+14/-1)
juju/providers/dummy.py (+2/-4)
juju/providers/ec2/__init__.py (+20/-2)
juju/providers/ec2/tests/test_provider.py (+13/-0)
juju/providers/ec2/tests/test_utils.py (+2/-0)
juju/providers/ec2/utils.py (+3/-2)
juju/providers/orchestra/__init__.py (+23/-4)
juju/providers/orchestra/tests/test_provider.py (+29/-2)
juju/state/environment.py (+9/-0)
juju/state/machine.py (+1/-4)
juju/state/service.py (+2/-3)
juju/state/tests/test_environment.py (+53/-4)
juju/state/tests/test_machine.py (+2/-2)
juju/state/tests/test_service.py (+47/-1)
juju/tests/test_errors.py (+6/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

513. By William Reade on 2012-04-04

copy over from weirded preflight-constraints branch

512. By Kapil Thangavelu on 2012-04-04

[trivial] tweak cli help options for consistency/formatting

511. By William Reade on 2012-04-04

When extracting charms, use only filetype mode bits to detect symlinkicity

We had been writing, and checking for, a magic value (in external_attr)
which happened to equal `(stat.S_IFLNK | 0755) << 16`; the charm store was
giving us one equal to `(stat.S_IFLNK | 0777) << 16`, and we weren't
considering that to be a symlink. We now just check the filetype and ignore
permissions on symlinks.

R=hazmat
CC=
https://codereview.appspot.com/5980045

510. By Jim Baker on 2012-04-04

merge relation-hook-context [r=hazmat][f=963642]

Implements caching and then looking up child relation hook contexts by
relation ident, along with enumerating relation idents, on a given
parent hook context.

509. By Kapil Thangavelu on 2012-04-04

[trivial] change deploy output when using charm store [r=niemeyer]

508. By Kapil Thangavelu on 2012-03-30

[trivial] juju only initializes the sample when given a command, post cli parsing

507. By Jim Baker on 2012-03-30

merge relation-id [r=hazmat][f=963640]

Implments relation id support (code calls this relation ident) to
unambiguously refer to relations.

506. By William Reade on 2012-03-30

Constraints feature

End result of many branches merged into lp:~fwereade/juju/shadow-trunk-1204
over the last couple of weeks. Includes provider-specific constraint
registration (not global), provision for legacy deployments, and environment
constraints.

R=
CC=
https://codereview.appspot.com/5971047

505. By Benjamin Saller on 2012-03-29

Support for scoped relations including container relations [f=947483] [r=kapil]

This includes all the low level support for container scoped relations. This is used
to implement subordinate services.

504. By Kapil Thangavelu on 2012-03-28

[trivial] change store url to correct location