← Back to branch summary

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

« back to all changes in this revision

Viewing changes to heat/db/sqlalchemy/migrate_repo/versions/041_migrate_hot_template_resources.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/db/sqlalchemy/migrate_repo/versions/041_migrate_hot_template_resources.py
11
11
#    under the License.
12
12
 
13
13
from migrate.versioning import util as migrate_util
14
 
from oslo.serialization import jsonutils
 
14
from oslo_serialization import jsonutils
15
15
import six
16
16
import sqlalchemy
17
17
from sqlalchemy.orm import sessionmaker