← Back to branch summary

~jimbaker/pyjuju/tyro-serialization-data-refactor

~jimbaker/pyjuju/tyro-serialization-data-refactor

Viewing all changes in revision 72.

Committer: kapil.thangavelu at canonical
Date: 2010-09-17 14:50:33 UTC
mfrom: (55.4.28 lp-616504-provision-this)
Revision ID: kapil.thangavelu@canonical.com-20100917145033-8i909zhbfrhiryyt

merge provisioning agent (and resolve conflicts) [f=616504][r=niememyer]

files added:
ensemble/lib/tests/test_twistutils.py

ensemble/lib/twistutils.py

files modified:
bin/ensemble-admin *

ensemble/agents/base.py

ensemble/agents/provision.py

ensemble/agents/tests/test_base.py

ensemble/agents/tests/test_provision.py

ensemble/errors.py

ensemble/ftests/test_ec2_provider.py

ensemble/lib/testing.py

ensemble/providers/common.py

ensemble/providers/ec2/__init__.py

ensemble/providers/ec2/launch.py

ensemble/providers/ec2/tests/test_launch.py

ensemble/providers/tests/test_common.py

ensemble/state/tests/common.py

ensemble/tests/test_errors.py

Show diffs side-by-side

added added

removed removed

ensemble/agents/base.py

ensemble/agents/provision.py

ensemble/agents/tests/test_base.py

ensemble/agents/tests/test_provision.py

ensemble/errors.py

ensemble/ftests/test_ec2_provider.py

ensemble/lib/testing.py

ensemble/lib/tests/test_twistutils.py

ensemble/lib/twistutils.py

ensemble/providers/common.py

ensemble/providers/ec2/__init__.py

ensemble/providers/ec2/launch.py

ensemble/providers/ec2/tests/test_launch.py

ensemble/providers/tests/test_common.py

ensemble/state/tests/common.py

ensemble/tests/test_errors.py

Older »