From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 25 Sep 2014 03:58:57 +0000 (+0000)
Subject: Merge "Forbid regular users to reset admin-only attrs to default values"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b71cb2fdc8ce34aff5072d445bf0414f5f5526cb;p=openstack-build%2Fneutron-build.git

Merge "Forbid regular users to reset admin-only attrs to default values"
---

b71cb2fdc8ce34aff5072d445bf0414f5f5526cb
diff --cc neutron/policy.py
index 092750add,b7f7873e1..4a521617e
--- a/neutron/policy.py
+++ b/neutron/policy.py
@@@ -16,8 -16,9 +16,10 @@@
  """
  Policy engine for neutron.  Largely copied from nova.
  """
+ 
+ import collections
  import itertools
 +import logging
  import re
  
  from oslo.config import cfg