← Back to branch summary

~hazmat/pyjuju/security-policy-with-topology

~hazmat/pyjuju/security-policy-with-topology

Viewing all changes in revision 326.

Committer: kapil.thangavelu at canonical
Date: 2011-08-17 17:43:58 UTC
mfrom: (316.1.9 states-with-principals)
Revision ID: kapil.thangavelu@canonical.com-20110817174358-57t2odwckywjmaox

merge trunk and resolve conflict

files added:
docs/source/expose-services.rst

ensemble/providers/common/base.py

ensemble/providers/common/findzookeepers.py

ensemble/providers/common/tests/test_base.py

ensemble/providers/common/tests/test_findzookeepers.py

ensemble/providers/ec2/connect.py

ensemble/providers/ec2/securitygroup.py

ensemble/providers/ec2/tests/test_getmachines.py

ensemble/providers/ec2/tests/test_securitygroup.py

ensemble/providers/orchestra/tests/common.py

ensemble/providers/orchestra/tests/data

ensemble/providers/orchestra/tests/data/bootstrap_late_command

ensemble/providers/orchestra/tests/data/launch_late_command

ensemble/providers/orchestra/tests/test_cobbler.py

ensemble/providers/orchestra/tests/test_findzookeepers.py

ensemble/providers/orchestra/tests/test_getmachines.py

ensemble/providers/orchestra/tests/test_launch.py

ensemble/providers/orchestra/tests/test_machine.py

ensemble/state/placement.py

ensemble/state/tests/test_placement.py

files removed:
ensemble/providers/ec2/accessor.py

ensemble/providers/ec2/connect.py

ensemble/providers/ec2/findzookeepers.py

ensemble/providers/ec2/iterate.py

ensemble/providers/ec2/shutdown.py

ensemble/providers/ec2/tests/test_accessor.py

ensemble/providers/ec2/tests/test_iterate.py

files modified:
bin/close-port

bin/config-get

bin/ensemble-log

bin/ensemble-make-image

bin/open-port

bin/relation-get

bin/relation-list

bin/relation-set

debian/ec2-build

docs/source/drafts/expose-services.rst

docs/source/formula.rst

docs/source/getting-started.rst

docs/source/index.rst

docs/source/internals/expose-services.rst

docs/source/provider-configuration-ec2.rst

docs/source/user-tutorial.rst

docs/source/write-formula.rst

ensemble/agents/provision.py

ensemble/agents/tests/test_provision.py

ensemble/agents/tests/test_unit.py

ensemble/agents/unit.py

ensemble/control/add_unit.py

ensemble/control/debug_hooks.py

ensemble/control/deploy.py

ensemble/control/shutdown.py

ensemble/control/tests/test_add_unit.py

ensemble/control/tests/test_deploy.py

ensemble/control/tests/test_shutdown.py

ensemble/environment/config.py

ensemble/environment/environment.py

ensemble/environment/tests/test_config.py

ensemble/environment/tests/test_environment.py

ensemble/errors.py

ensemble/ftests/test_ec2_provider.py

ensemble/hooks/commands.py

ensemble/hooks/invoker.py

ensemble/hooks/tests/test_invoker.py

ensemble/machine/__init__.py

ensemble/machine/tests/test_machine.py

ensemble/providers/common/bootstrap.py

ensemble/providers/common/launch.py

ensemble/providers/common/tests/test_launch.py

ensemble/providers/common/tests/test_state.py

ensemble/providers/common/tests/test_utils.py

ensemble/providers/common/utils.py

ensemble/providers/dummy.py

ensemble/providers/ec2/__init__.py

ensemble/providers/ec2/launch.py

ensemble/providers/ec2/machine.py

ensemble/providers/ec2/tests/common.py

ensemble/providers/ec2/tests/test_bootstrap.py

ensemble/providers/ec2/tests/test_connect.py

ensemble/providers/ec2/tests/test_files.py

ensemble/providers/ec2/tests/test_findzookeeper.py

ensemble/providers/ec2/tests/test_launch.py

ensemble/providers/ec2/tests/test_provider.py

ensemble/providers/ec2/tests/test_shutdown.py

ensemble/providers/ec2/tests/test_state.py

ensemble/providers/ec2/tests/test_utils.py

ensemble/providers/ec2/utils.py

ensemble/providers/orchestra/__init__.py

ensemble/providers/orchestra/cobbler.py

ensemble/providers/orchestra/files.py

ensemble/providers/orchestra/launch.py

ensemble/providers/orchestra/machine.py

ensemble/providers/orchestra/tests/test_bootstrap.py

ensemble/providers/orchestra/tests/test_files.py

ensemble/providers/orchestra/tests/test_provider.py

ensemble/providers/tests/test_dummy.py

ensemble/state/base.py

ensemble/state/errors.py

ensemble/state/service.py

ensemble/state/tests/test_base.py

ensemble/state/tests/test_errors.py

ensemble/state/tests/test_service.py

ensemble/state/tests/test_topology.py

ensemble/state/topology.py

ensemble/tests/test_errors.py

examples/wordpress/hooks/db-relation-changed

misc/bash_completion.d/ensemble

Show diffs side-by-side

added added

removed removed

bin/ensemble-log

bin/ensemble-make-image

bin/relation-get

bin/relation-list

bin/relation-set

debian/ec2-build

docs/source/drafts/expose-services.rst

docs/source/expose-services.rst

docs/source/formula.rst

docs/source/getting-started.rst

docs/source/index.rst

docs/source/internals/expose-services.rst

docs/source/provider-configuration-ec2.rst

docs/source/user-tutorial.rst

docs/source/write-formula.rst

ensemble/agents/provision.py

ensemble/agents/tests/test_provision.py

ensemble/agents/tests/test_unit.py

ensemble/agents/unit.py

ensemble/control/add_unit.py

ensemble/control/debug_hooks.py

ensemble/control/deploy.py

ensemble/control/shutdown.py

ensemble/control/tests/test_add_unit.py

ensemble/control/tests/test_deploy.py

ensemble/control/tests/test_shutdown.py

ensemble/environment/config.py

ensemble/environment/environment.py

ensemble/environment/tests/test_config.py

ensemble/environment/tests/test_environment.py

ensemble/errors.py

ensemble/ftests/test_ec2_provider.py

ensemble/hooks/commands.py

ensemble/hooks/invoker.py

ensemble/hooks/tests/test_invoker.py

ensemble/machine/__init__.py

ensemble/machine/tests/test_machine.py

ensemble/providers/common/base.py

ensemble/providers/common/bootstrap.py

ensemble/providers/common/findzookeepers.py

ensemble/providers/common/launch.py

ensemble/providers/common/tests/test_base.py

ensemble/providers/common/tests/test_findzookeepers.py

ensemble/providers/common/tests/test_launch.py

ensemble/providers/common/tests/test_state.py

ensemble/providers/common/tests/test_utils.py

ensemble/providers/common/utils.py

ensemble/providers/dummy.py

ensemble/providers/ec2/__init__.py

ensemble/providers/ec2/accessor.py

ensemble/providers/ec2/connect.py

ensemble/providers/ec2/connect.py

ensemble/providers/ec2/findzookeepers.py

ensemble/providers/ec2/iterate.py

ensemble/providers/ec2/launch.py

ensemble/providers/ec2/machine.py

ensemble/providers/ec2/securitygroup.py

ensemble/providers/ec2/shutdown.py

ensemble/providers/ec2/tests/common.py

ensemble/providers/ec2/tests/test_accessor.py

ensemble/providers/ec2/tests/test_bootstrap.py

ensemble/providers/ec2/tests/test_connect.py

ensemble/providers/ec2/tests/test_files.py

ensemble/providers/ec2/tests/test_findzookeeper.py

ensemble/providers/ec2/tests/test_getmachines.py

ensemble/providers/ec2/tests/test_iterate.py

ensemble/providers/ec2/tests/test_launch.py

ensemble/providers/ec2/tests/test_provider.py

ensemble/providers/ec2/tests/test_securitygroup.py

ensemble/providers/ec2/tests/test_shutdown.py

ensemble/providers/ec2/tests/test_state.py

ensemble/providers/ec2/tests/test_utils.py

ensemble/providers/ec2/utils.py

ensemble/providers/orchestra/__init__.py

ensemble/providers/orchestra/cobbler.py

ensemble/providers/orchestra/files.py

ensemble/providers/orchestra/launch.py

ensemble/providers/orchestra/machine.py

ensemble/providers/orchestra/tests/common.py

ensemble/providers/orchestra/tests/data/

ensemble/providers/orchestra/tests/data/bootstrap_late_command

ensemble/providers/orchestra/tests/data/launch_late_command

ensemble/providers/orchestra/tests/test_bootstrap.py

ensemble/providers/orchestra/tests/test_cobbler.py

ensemble/providers/orchestra/tests/test_files.py

ensemble/providers/orchestra/tests/test_findzookeepers.py

ensemble/providers/orchestra/tests/test_getmachines.py

ensemble/providers/orchestra/tests/test_launch.py

ensemble/providers/orchestra/tests/test_machine.py

ensemble/providers/orchestra/tests/test_provider.py

ensemble/providers/tests/test_dummy.py

ensemble/state/base.py

ensemble/state/errors.py

ensemble/state/placement.py

ensemble/state/service.py

ensemble/state/tests/test_base.py

ensemble/state/tests/test_errors.py

ensemble/state/tests/test_placement.py

ensemble/state/tests/test_service.py

ensemble/state/tests/test_topology.py

ensemble/state/topology.py

ensemble/tests/test_errors.py

examples/wordpress/hooks/db-relation-changed

misc/bash_completion.d/ensemble

Older »