← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2262.

Committer: Gavin Panella
Date: 2014-07-15 16:47:31 UTC
mfrom: (1745.2.488 maas)
Revision ID: gavin.panella@canonical.com-20140715164731-zu3kzf4ju2nslt9u

Merge trunk r2233.

files modified:
docs/conf.py

pkg/maas-cluster/provisioningserver/custom_hardware/seamicro.py

pkg/maas-region/maasserver/context_processors.py

pkg/maas-region/maasserver/templates/registration/login.html

pkg/maas-region/maasserver/views/tests/test_account.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/custom_hardware/seamicro.py

pkg/maas-region/maasserver/context_processors.py

pkg/maas-region/maasserver/views/tests/test_account.py

Older »