← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2204.

Committer: Gavin Panella
Date: 2014-04-01 14:54:33 UTC
mfrom: (1745.2.430 maas)
Revision ID: gavin.panella@canonical.com-20140401145433-9eu3pah10e50dr1r

Merge trunk r2175.

files added:
pkg/maas-region/maasserver/security.py

pkg/maas-region/maasserver/tests/test_security.py

files modified:
README

pkg/maas-region/maasserver/locks.py

pkg/maas-region/maasserver/models/config.py

Show diffs side-by-side

added added

removed removed

pkg/maas-region/maasserver/locks.py

pkg/maas-region/maasserver/models/config.py

pkg/maas-region/maasserver/security.py

pkg/maas-region/maasserver/tests/test_security.py

Older »