Merge lp:~zulcss/heat/refresh-aug14 into lp:~ubuntu-server-dev/heat/havana

[Chuck Short]

- Drop sqlalchemy patch
- Add python-netaddr dependency
- Dropped heat-boto, heat-watch and heat-cfn.

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-08 14:42:41 +0000
+++ debian/changelog	2013-08-14 14:21:47 +0000
@@ -1,3 +1,14 @@
+heat (2013.2.a281.gc92aa02-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control: Add python-netaddr as build-dep.
+  * debian/heat-common.install: Remove heat-boto and associated man-page
+  * debian/heat-common.install: Remove heat-cfn and associated man-page
+  * debian/heat-common.install: Remove heat-watch and associated man-page
+  * debian/patches/fix-sqlalchemy-0.8.patch: Dropped 
+
+ -- Chuck Short <[e-mail]>  Wed, 14 Aug 2013 13:45:10 +0000
+
 heat (2013.2~b2.a186.g2b4b248-0ubuntu2) saucy; urgency=low
 
   * d/rules: Limit test execution concurrency to 1 to avoid test failures

=== modified file 'debian/control'
--- debian/control	2013-08-08 13:58:16 +0000
+++ debian/control	2013-08-14 14:21:47 +0000
@@ -34,6 +34,7 @@
  python-memcache,
  python-migrate,
  python-mox,
+ python-netaddr,
  python-neutronclient (>= 1:2.2.0),
  python-nose,
  python-nosexcover,

=== modified file 'debian/heat-common.install'
--- debian/heat-common.install	2013-08-08 14:24:41 +0000
+++ debian/heat-common.install	2013-08-14 14:21:47 +0000
@@ -1,7 +1,4 @@
-/usr/bin/heat-boto
-/usr/bin/heat-cfn
 /usr/bin/heat-manage
-/usr/bin/heat-watch
 /usr/bin/heat-keystone-setup
 etc/heat/policy.json
 etc/heat/api-paste.ini

=== modified file 'debian/heat-common.manpages'
--- debian/heat-common.manpages	2013-08-08 14:24:41 +0000
+++ debian/heat-common.manpages	2013-08-14 14:21:47 +0000
@@ -1,4 +1,1 @@
-doc/build/man/heat-cfn.1
-doc/build/man/heat-boto.1
-doc/build/man/heat-watch.1
 doc/build/man/heat-keystone-setup.1

=== removed file 'debian/patches/fix-sqlalchemy-0.8.patch'
--- debian/patches/fix-sqlalchemy-0.8.patch	2013-08-08 01:08:46 +0000
+++ debian/patches/fix-sqlalchemy-0.8.patch	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-Description: Fix heat db to work with sqlachmey 0.8.
-Author: Chuck Short <[e-mail]>
-Forwarded: No
-diff -Naurp heat-2013.2.b2.orig/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py heat-2013.2.b2/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py
---- heat-2013.2.b2.orig/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py	2013-07-18 15:48:34.000000000 +0000
-+++ heat-2013.2.b2/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py	2013-08-07 19:47:05.291156844 +0000
-@@ -22,11 +22,7 @@ def upgrade(migrate_engine):
-     # Align the current state/state_description with the
-     # action/status now used in the event table
-     action = sqlalchemy.Column('action',
--                               sqlalchemy.String(length=255,
--                                                 convert_unicode=False,
--                                                 assert_unicode=None,
--                                                 unicode_error=None,
--                                                 _warn_on_bytestring=False))
-+                               sqlalchemy.String(length=255))
-     action.create(resource)
-     resource.c.state.alter(name='status')
-     resource.c.state_description.alter(name='status_reason')
-diff -Naurp heat-2013.2.b2.orig/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py heat-2013.2.b2/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py
---- heat-2013.2.b2.orig/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py	2013-07-18 15:48:34.000000000 +0000
-+++ heat-2013.2.b2/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py	2013-08-07 19:47:30.935156844 +0000
-@@ -21,11 +21,7 @@ def upgrade(migrate_engine):
-     stack = sqlalchemy.Table('stack', meta, autoload=True)
-     # Align with action/status now used in the event/resource tables
-     action = sqlalchemy.Column('action',
--                               sqlalchemy.String(length=255,
--                                                 convert_unicode=False,
--                                                 assert_unicode=None,
--                                                 unicode_error=None,
--                                                 _warn_on_bytestring=False))
-+                               sqlalchemy.String(length=255))
-     action.create(stack)
- 
- 
-diff -Naurp heat-2013.2.b2.orig/heat/db/sqlalchemy/models.py heat-2013.2.b2/heat/db/sqlalchemy/models.py
---- heat-2013.2.b2.orig/heat/db/sqlalchemy/models.py	2013-07-18 15:48:34.000000000 +0000
-+++ heat-2013.2.b2/heat/db/sqlalchemy/models.py	2013-08-07 19:46:17.583156844 +0000
-@@ -20,6 +20,7 @@ import sqlalchemy
- from sqlalchemy.orm import relationship, backref, object_mapper
- from sqlalchemy.exc import IntegrityError
- from sqlalchemy.ext.declarative import declarative_base
-+from sqlalchemy.ext.mutable import Mutable
- from sqlalchemy import types
- from json import dumps
- from json import loads
-@@ -32,7 +33,7 @@ from sqlalchemy.orm.session import Sessi
- BASE = declarative_base()
- 
- 
--class Json(types.TypeDecorator, types.MutableType):
-+class Json(types.TypeDecorator):
-     impl = types.Text
- 
-     def process_bind_param(self, value, dialect):
-@@ -42,6 +43,48 @@ class Json(types.TypeDecorator, types.Mu
-         return loads(value)
- 
- 
-+#This class already in sqlalchemy 0.8 but not in 0.7
-+#Add it here for integration
-+class MutableDict(Mutable, dict):
-+    """A dictionary type that implements :class:`.Mutable`.
-+
-+    .. versionadded in sqlalchemy:: 0.8
-+
-+    """
-+
-+    def __setitem__(self, key, value):
-+        """Detect dictionary set events and emit change events."""
-+        dict.__setitem__(self, key, value)
-+        self.changed()
-+
-+    def __delitem__(self, key):
-+        """Detect dictionary del events and emit change events."""
-+        dict.__delitem__(self, key)
-+        self.changed()
-+
-+    def clear(self):
-+        dict.clear(self)
-+        self.changed()
-+
-+    @classmethod
-+    def coerce(cls, key, value):
-+        """Convert plain dictionary to MutableDict."""
-+        if not isinstance(value, MutableDict):
-+            if isinstance(value, dict):
-+                return MutableDict(value)
-+            return Mutable.coerce(key, value)
-+        else:
-+            return value
-+
-+    def __getstate__(self):
-+        return dict(self)
-+
-+    def __setstate__(self, state):
-+        self.update(state)
-+
-+MutableDict.associate_with(Json)
-+
-+
- class HeatBase(object):
-     """Base class for Heat Models."""
-     __table_args__ = {'mysql_engine': 'InnoDB'}
-diff -Naurp heat-2013.2.b2.orig/requirements.txt heat-2013.2.b2/requirements.txt
---- heat-2013.2.b2.orig/requirements.txt	2013-07-18 15:48:34.000000000 +0000
-+++ heat-2013.2.b2/requirements.txt	2013-08-07 19:47:41.343156844 +0000
-@@ -14,7 +14,7 @@ sqlalchemy-migrate>=0.7.2
- python-novaclient>=2.12.0
- PasteDeploy==1.5.0
- routes==1.12.3
--SQLAlchemy>=0.7.8,<0.7.99
-+SQLAlchemy>=0.7.8,<0.8.99
- WebOb==1.2.3
- python-keystoneclient>=0.2.1
- python-swiftclient>=1.2

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-08-08 13:55:17 +0000
+++ debian/patches/series	2013-08-14 14:21:47 +0000
@@ -1,4 +1,2 @@
-fix-sqlalchemy-0.8.patch
-
 default-sqlite.patch
 default-kombu.patch