← Back to branch summary

~fwereade/pyjuju/cobbler-zk-connect

~fwereade/pyjuju/cobbler-zk-connect

Viewing all changes in revision 337.

Committer: William Reade
Date: 2011-08-23 12:54:28 UTC
mfrom: (306.1.18 trunk)
Revision ID: fwereade@gmail.com-20110823125428-5908s30d5150euwe

merge trunk

files modified:
Makefile

ensemble/formula/publisher.py

ensemble/formula/tests/test_publisher.py

ensemble/providers/dummy.py

ensemble/providers/ec2/files.py

ensemble/providers/ec2/tests/common.py

ensemble/providers/ec2/tests/test_files.py

ensemble/providers/orchestra/files.py

ensemble/providers/orchestra/tests/test_files.py

ensemble/providers/tests/test_dummy.py

ensemble/state/formula.py

ensemble/state/tests/test_formula.py

ensemble/state/tests/test_machine.py

ensemble/state/tests/test_relation.py

ensemble/state/tests/test_service.py

ensemble/unit/formula.py

ensemble/unit/tests/test_formula.py

Show diffs side-by-side

added added

removed removed

ensemble/formula/publisher.py

ensemble/formula/tests/test_publisher.py

ensemble/providers/dummy.py

ensemble/providers/ec2/files.py

ensemble/providers/ec2/tests/common.py

ensemble/providers/ec2/tests/test_files.py

ensemble/providers/orchestra/files.py

ensemble/providers/orchestra/tests/test_files.py

ensemble/providers/tests/test_dummy.py

ensemble/state/formula.py

ensemble/state/tests/test_formula.py

ensemble/state/tests/test_machine.py

ensemble/state/tests/test_relation.py

ensemble/state/tests/test_service.py

ensemble/unit/formula.py

ensemble/unit/tests/test_formula.py

Older »