← Back to branch summary

~jimbaker/pyjuju/relation-hook-context

~jimbaker/pyjuju/relation-hook-context

Viewing all changes in revision 526.

Committer: Jim Baker
Date: 2012-04-05 00:59:48 UTC
mfrom: (485.1.27 trunk)
Revision ID: jim.baker@canonical.com-20120405005948-h3xqa38d6qjgpp4t

Merged trunk for this already merged branch to workaround lbox prereq issue

files modified:
juju/charm/base.py

juju/charm/bundle.py

juju/charm/directory.py

juju/charm/repository.py

juju/charm/tests/test_bundle.py

juju/control/config_set.py

juju/control/destroy_environment.py

juju/control/scp.py

Show diffs side-by-side

added added

removed removed

juju/charm/base.py

juju/charm/bundle.py

juju/charm/directory.py

juju/charm/repository.py

juju/charm/tests/test_bundle.py

juju/control/config_set.py

juju/control/destroy_environment.py

juju/control/scp.py

Older »