← Back to branch summary

~free.ekanayaka/landscape-client/juju-machine-registration

~free.ekanayaka/landscape-client/juju-machine-registration

Viewing all changes in revision 768.

Committer: Adam Collard
Date: 2014-06-05 16:44:16 UTC
Revision ID: adam.collard@canonical.com-20140605164416-gsn39l8692z02g24

Revert r767 due to broken server imports [r=chad.smith]

bzr merge -r 767..766

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 »