← Back to branch summary

~hazmat/pyjuju/fast-yaml

~hazmat/pyjuju/fast-yaml

Viewing all changes in revision 578.

Committer: Kapil Thangavelu
Date: 2012-09-15 14:13:27 UTC
mfrom: (573.1.4 trunk)
Revision ID: kapil@canonical.com-20120915141327-u7pkwze0hrp8144r

merge trunk and resolve conflicts

files modified:
juju/charm/config.py

juju/control/config_get.py

juju/control/tests/test_config_get.py

juju/control/tests/test_config_set.py

juju/environment/config.py

juju/environment/tests/test_config.py

juju/hooks/cli.py

juju/hooks/protocol.py

juju/hooks/tests/test_cli.py

juju/hooks/tests/test_invoker.py

juju/lib/format.py

juju/lib/tests/test_format.py

juju/providers/openstack/client.py

juju/providers/openstack/provider.py

juju/providers/openstack/tests/test_client.py

Show diffs side-by-side

added added

removed removed

juju/charm/config.py

juju/control/config_get.py

juju/control/tests/test_config_get.py

juju/control/tests/test_config_set.py

juju/environment/config.py

juju/environment/tests/test_config.py

juju/hooks/cli.py

juju/hooks/protocol.py

juju/hooks/tests/test_cli.py

juju/hooks/tests/test_invoker.py

juju/lib/format.py

juju/lib/tests/test_format.py

juju/providers/openstack/client.py

juju/providers/openstack/provider.py

juju/providers/openstack/tests/test_client.py

Older »