Viewing all changes in revision 316.
- Committer: kapil.thangavelu at canonical
- Date: 2011-08-04 19:52:44 UTC
- mfrom: (297.1.2 security-acl)
- Revision ID: kapil.thangavelu@canonical.com-20110804195244-786968ewt7a6pdwv
merge conflict from removal of security-policy-rules
- files renamed:
- ensemble/state/securityrules.py => ensemble/state/securityrules.py.THIS
- ensemble/state/tests/test_securityrules.py => ensemble/state/tests/test_securityrules.py.THIS
- files modified:
- ensemble/state/security.py
expand all
collapse all
added
removed
