← Back to branch summary

~fwereade/pyjuju/preflight-constraints

~fwereade/pyjuju/preflight-constraints

Viewing all changes in revision 467.4.8.

Committer: kapil.thangavelu at canonical
Date: 2012-03-28 02:42:58 UTC
mfrom: (494.1.8 trunk)
mto: (494.1.9 trunk)
mto: This revision was merged to the branch mainline in revision 503.
Revision ID: kapil.thangavelu@canonical.com-20120328024258-7w55lksi9yw46c00

merge trunk

files added:
docs/source/drafts/implicit-relations.rst

docs/source/drafts/subordinate-internals.rst

docs/source/drafts/subordinate-services.rst

juju/charm/tests/repository/series/funkyblog

juju/charm/tests/repository/series/funkyblog/config.yaml

juju/charm/tests/repository/series/funkyblog/metadata.yaml

juju/charm/tests/repository/series/funkyblog/revision

juju/charm/tests/repository/series/logging

juju/charm/tests/repository/series/logging/.ignored

juju/charm/tests/repository/series/logging/hooks

juju/charm/tests/repository/series/logging/hooks/install

juju/charm/tests/repository/series/logging/metadata.yaml

juju/charm/tests/repository/series/logging/revision

juju/control/constraints_set.py

juju/control/tests/test_constraints_set.py

juju/machine/constraints.py

juju/machine/tests/test_constraints.py

juju/providers/maas

juju/providers/maas/__init__.py

juju/providers/maas/auth.py

juju/providers/maas/files.py

juju/providers/maas/launch.py

juju/providers/maas/maas.py

juju/providers/maas/machine.py

juju/providers/maas/provider.py

juju/providers/maas/tests

juju/providers/maas/tests/__init__.py

juju/providers/maas/tests/test_auth.py

juju/providers/maas/tests/test_files.py

juju/providers/maas/tests/test_launch.py

juju/providers/maas/tests/test_maas.py

juju/providers/maas/tests/test_machine.py

juju/providers/maas/tests/test_provider.py

juju/providers/maas/tests/testing.py

juju/unit/deploy.py

juju/unit/tests/test_deploy.py

files modified:
.bzrignore

docs/source/charm-upgrades.rst

docs/source/charm.rst

juju/agents/machine.py

juju/agents/provision.py

juju/agents/tests/test_machine.py

juju/agents/tests/test_provision.py

juju/agents/tests/test_unit.py

juju/agents/unit.py

juju/charm/bundle.py

juju/charm/config.py

juju/charm/directory.py

juju/charm/errors.py

juju/charm/metadata.py

juju/charm/publisher.py

juju/charm/repository.py

juju/charm/tests/test_bundle.py

juju/charm/tests/test_config.py

juju/charm/tests/test_directory.py

juju/charm/tests/test_errors.py

juju/charm/tests/test_metadata.py

juju/charm/tests/test_publisher.py

juju/charm/tests/test_repository.py

juju/control/__init__.py

juju/control/add_relation.py

juju/control/deploy.py

juju/control/remove_relation.py

juju/control/status.py

juju/control/tests/common.py

juju/control/tests/test_add_relation.py

juju/control/tests/test_add_unit.py

juju/control/tests/test_admin.py

juju/control/tests/test_config_set.py

juju/control/tests/test_debug_hooks.py

juju/control/tests/test_deploy.py

juju/control/tests/test_destroy_environment.py

juju/control/tests/test_remove_unit.py

juju/control/tests/test_scp.py

juju/control/tests/test_ssh.py

juju/control/tests/test_status.py

juju/control/tests/test_terminate_machine.py

juju/control/tests/test_upgrade_charm.py

juju/control/tests/test_utils.py

juju/control/upgrade_charm.py

juju/control/utils.py

juju/environment/config.py

juju/errors.py

juju/hooks/invoker.py

juju/hooks/tests/test_cli.py

juju/hooks/tests/test_invoker.py

juju/hooks/tests/test_scheduler.py

juju/lib/schema.py

juju/lib/testing.py

juju/lib/tests/test_schema.py

juju/lib/zklog.py

juju/machine/__init__.py

juju/providers/common/tests/test_cloudinit.py

juju/providers/ec2/securitygroup.py

juju/providers/ec2/tests/test_utils.py

juju/providers/ec2/utils.py

juju/providers/orchestra/launch.py

juju/state/base.py

juju/state/errors.py

juju/state/initialize.py

juju/state/machine.py

juju/state/placement.py

juju/state/service.py

juju/state/tests/test_errors.py

juju/state/tests/test_firewall.py

juju/state/tests/test_initialize.py

juju/state/tests/test_machine.py

juju/state/tests/test_placement.py

juju/state/tests/test_relation.py

juju/state/tests/test_security.py

juju/state/tests/test_service.py

juju/state/tests/test_utils.py

juju/state/topology.py

juju/state/utils.py

juju/tests/test_errors.py

juju/unit/address.py

juju/unit/charm.py

juju/unit/lifecycle.py

juju/unit/tests/test_address.py

juju/unit/tests/test_lifecycle.py

juju/unit/tests/test_workflow.py

Show diffs side-by-side

added added

removed removed

docs/source/charm-upgrades.rst

docs/source/charm.rst

docs/source/drafts/implicit-relations.rst

docs/source/drafts/subordinate-internals.rst

docs/source/drafts/subordinate-services.rst

juju/agents/machine.py

juju/agents/provision.py

juju/agents/tests/test_machine.py

juju/agents/tests/test_provision.py

juju/agents/tests/test_unit.py

juju/agents/unit.py

juju/charm/bundle.py

juju/charm/config.py

juju/charm/directory.py

juju/charm/errors.py

juju/charm/metadata.py

juju/charm/publisher.py

juju/charm/repository.py

juju/charm/tests/repository/series/funkyblog/

juju/charm/tests/repository/series/funkyblog/config.yaml

juju/charm/tests/repository/series/funkyblog/metadata.yaml

juju/charm/tests/repository/series/funkyblog/revision

juju/charm/tests/repository/series/logging/

juju/charm/tests/repository/series/logging/.ignored

juju/charm/tests/repository/series/logging/hooks/

juju/charm/tests/repository/series/logging/hooks/install

juju/charm/tests/repository/series/logging/metadata.yaml

juju/charm/tests/repository/series/logging/revision

juju/charm/tests/test_bundle.py

juju/charm/tests/test_config.py

juju/charm/tests/test_directory.py

juju/charm/tests/test_errors.py

juju/charm/tests/test_metadata.py

juju/charm/tests/test_publisher.py

juju/charm/tests/test_repository.py

juju/control/__init__.py

juju/control/add_relation.py

juju/control/constraints_set.py

juju/control/deploy.py

juju/control/remove_relation.py

juju/control/status.py

juju/control/tests/common.py

juju/control/tests/test_add_relation.py

juju/control/tests/test_add_unit.py

juju/control/tests/test_admin.py

juju/control/tests/test_config_set.py

juju/control/tests/test_constraints_set.py

juju/control/tests/test_debug_hooks.py

juju/control/tests/test_deploy.py

juju/control/tests/test_destroy_environment.py

juju/control/tests/test_remove_unit.py

juju/control/tests/test_scp.py

juju/control/tests/test_ssh.py

juju/control/tests/test_status.py

juju/control/tests/test_terminate_machine.py

juju/control/tests/test_upgrade_charm.py

juju/control/tests/test_utils.py

juju/control/upgrade_charm.py

juju/control/utils.py

juju/environment/config.py

juju/hooks/invoker.py

juju/hooks/tests/test_cli.py

juju/hooks/tests/test_invoker.py

juju/hooks/tests/test_scheduler.py

juju/lib/schema.py

juju/lib/testing.py

juju/lib/tests/test_schema.py

juju/lib/zklog.py

juju/machine/__init__.py

juju/machine/constraints.py

juju/machine/tests/test_constraints.py

juju/providers/common/tests/test_cloudinit.py

juju/providers/ec2/securitygroup.py

juju/providers/ec2/tests/test_utils.py

juju/providers/ec2/utils.py

juju/providers/maas/

juju/providers/maas/__init__.py

juju/providers/maas/auth.py

juju/providers/maas/files.py

juju/providers/maas/launch.py

juju/providers/maas/maas.py

juju/providers/maas/machine.py

juju/providers/maas/provider.py

juju/providers/maas/tests/

juju/providers/maas/tests/__init__.py

juju/providers/maas/tests/test_auth.py

juju/providers/maas/tests/test_files.py

juju/providers/maas/tests/test_launch.py

juju/providers/maas/tests/test_maas.py

juju/providers/maas/tests/test_machine.py

juju/providers/maas/tests/test_provider.py

juju/providers/maas/tests/testing.py

juju/providers/orchestra/launch.py

juju/state/base.py

juju/state/errors.py

juju/state/initialize.py

juju/state/machine.py

juju/state/placement.py

juju/state/service.py

juju/state/tests/test_errors.py

juju/state/tests/test_firewall.py

juju/state/tests/test_initialize.py

juju/state/tests/test_machine.py

juju/state/tests/test_placement.py

juju/state/tests/test_relation.py

juju/state/tests/test_security.py

juju/state/tests/test_service.py

juju/state/tests/test_utils.py

juju/state/topology.py

juju/state/utils.py

juju/tests/test_errors.py

juju/unit/address.py

juju/unit/charm.py

juju/unit/deploy.py

juju/unit/lifecycle.py

juju/unit/tests/test_address.py

juju/unit/tests/test_deploy.py

juju/unit/tests/test_lifecycle.py

juju/unit/tests/test_workflow.py

Older »