← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0001-fix-useexisting-deprecation-warnings.patch

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-fix-useexisting-deprecation-warnings.patch
1
 
From 0d68f87ed726644f9387c47c862b7ee8cbcc77ad Mon Sep 17 00:00:00 2001
2
 
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
3
 
Date: Thu, 8 Mar 2012 16:32:30 +0000
4
 
Subject: [PATCH] fix useexisting deprecation warnings
5
 
 
6
 
Fixes deprecation warnings when using sqlalchemy >= 0.7.0
7
 
Fixes bug 941951
8
 
 
9
 
Change-Id: Iaa57153f99c60c67a14c1dca849188937bdc5dee
10
 
---
11
 
 .../075_convert_bw_usage_to_store_network_id.py    |    4 ++--
12
 
 .../versions/081_drop_instance_id_bw_cache.py      |    2 +-
13
 
 2 files changed, 3 insertions(+), 3 deletions(-)
14
 
 
15
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py b/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py
16
 
index b275524..4ff3d99 100644
17
 
--- a/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py
18
 
+++ b/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py
19
 
@@ -46,7 +46,7 @@ def upgrade(migrate_engine):
20
 
                 Column('last_refreshed', DateTime(timezone=False)),
21
 
                 Column('bw_in', BigInteger()),
22
 
                 Column('bw_out', BigInteger()),
23
 
-                useexisting=True)
24
 
+                extend_existing=True)
25
 
     mac_column = Column('mac', String(255))
26
 
     bw_usage_cache.create_column(mac_column)
27
 
 
28
 
@@ -81,7 +81,7 @@ def downgrade(migrate_engine):
29
 
                 Column('last_refreshed', DateTime(timezone=False)),
30
 
                 Column('bw_in', BigInteger()),
31
 
                 Column('bw_out', BigInteger()),
32
 
-                useexisting=True)
33
 
+                extend_existing=True)
34
 
 
35
 
     network_label_column = Column('network_label', String(255))
36
 
     bw_usage_cache.create_column(network_label_column)
37
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py b/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py
38
 
index c6687ac..a607ed3 100644
39
 
--- a/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py
40
 
+++ b/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py
41
 
@@ -37,7 +37,7 @@ def upgrade(migrate_engine):
42
 
         Column('last_refreshed', DateTime(timezone=False)),
43
 
         Column('bw_in', BigInteger()),
44
 
         Column('bw_out', BigInteger()),
45
 
-        useexisting=True)
46
 
+        extend_existing=True)
47
 
 
48
 
     bw_usage_cache.drop_column('instance_id')
49
 
 
50
 
1.7.9.1
51