← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily-proposed

« back to all changes in this revision

Viewing changes to heat/api/aws/ec2token.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-03-30 11:11:18 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20150330111118-2qpycylx6swu4yhj
Tags: 2015.1~b3-0ubuntu1
[ Corey Bryant ]
* New upstream milestone release for OpenStack kilo:
  - d/control: Align with upstream dependencies.
  - d/p/sudoers_patch.patch: Rebased.
  - d/p/fix-requirements.patch: Rebased.

[ James Page ]
* d/p/fixup-assert-regex.patch: Tweak test to use assertRegexpMatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/api/aws/ec2token.py
13
13
 
14
14
import hashlib
15
15
 
16
 
from oslo.config import cfg
17
 
from oslo.serialization import jsonutils as json
18
 
from oslo.utils import importutils
 
16
from oslo_config import cfg
 
17
from oslo_log import log as logging
 
18
from oslo_serialization import jsonutils as json
 
19
from oslo_utils import importutils
19
20
import requests
20
21
import webob
21
22
 
24
25
from heat.common.i18n import _LE
25
26
from heat.common.i18n import _LI
26
27
from heat.common import wsgi
27
 
from heat.openstack.common import log as logging
28
28
 
29
29
LOG = logging.getLogger(__name__)
30
30