From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 6 Feb 2013 22:02:55 +0000 (+0000)
Subject: Merge "heat api : Add policy.json authorization to CFN API"
X-Git-Tag: 2014.1~926
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=aa80a0700d3972e53b9fc794edb70161652f424e;p=openstack-build%2Fheat-build.git

Merge "heat api : Add policy.json authorization to CFN API"
---

aa80a0700d3972e53b9fc794edb70161652f424e
diff --cc heat/tests/test_api_cfn_v1.py
index 014c8c47,0c3f27f5..e9d890c4
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@@ -18,8 -19,11 +19,9 @@@ import o
  import unittest
  from nose.plugins.attrib import attr
  
 -import json
 -
  from heat.common import context
  from heat.common import identifier
+ from heat.common import policy
  from heat.openstack.common import cfg
  from heat.openstack.common import rpc
  import heat.openstack.common.rpc.common as rpc_common