← Back to branch summary

~tribaal/landscape-client/multiple-juju-unit-files

~tribaal/landscape-client/multiple-juju-unit-files

Viewing all changes in revision 780.

Committer: Christopher Glass
Date: 2014-06-06 14:17:20 UTC
mfrom: (766.1.2 trunk)
Revision ID: christopher.glass@canonical.com-20140606141720-15e7e3uips0nnv5f

Merge trunk

files modified:
landscape/broker/registration.py

landscape/broker/tests/helpers.py

landscape/broker/tests/test_registration.py

landscape/deployment.py

landscape/lib/juju.py

landscape/lib/tests/test_juju.py

landscape/message_schemas.py

landscape/monitor/jujuinfo.py

landscape/monitor/tests/test_jujuinfo.py

landscape/tests/test_deployment.py

Show diffs side-by-side

added added

removed removed

landscape/broker/registration.py

landscape/broker/tests/helpers.py

landscape/broker/tests/test_registration.py

landscape/deployment.py

landscape/lib/juju.py

landscape/lib/tests/test_juju.py

landscape/message_schemas.py

landscape/monitor/jujuinfo.py

landscape/monitor/tests/test_jujuinfo.py

landscape/tests/test_deployment.py

Older »