← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2061.

Committer: Gavin Panella
Date: 2014-03-30 21:29:16 UTC
mfrom: (1745.2.291 maas)
Revision ID: gavin.panella@canonical.com-20140330212916-31z21tutgj60329h

Merge trunk r2036.

files modified:
pkg/maas-client/maascli/api.py

pkg/maas-client/maascli/tests/test_api.py

pkg/maas-region/maasserver/forms_settings.py

Show diffs side-by-side

added added

removed removed

pkg/maas-client/maascli/api.py

pkg/maas-client/maascli/tests/test_api.py

pkg/maas-region/maasserver/forms_settings.py

Older »