← Back to branch summary

~gandelman-a/ubuntu/precise/glance/UCA_2012.2.1

« back to all changes in this revision

Viewing changes to debian/patches/sql_conn.patch

  • Committer: James Page
  • Author(s): Adam Gandelman
  • Date: 2012-10-19 23:02:14 UTC
  • Revision ID: james.page@canonical.com-20121019230214-rl9m5vp2dwbw1iun
Tags: 2012.2-0ubuntu2~cloud0
New release candidate for the Ubuntu Cloud Archive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/sql_conn.patch
1
 
Index: glance/etc/glance-api.conf
 
1
Index: glance-2012.2.1/etc/glance-api.conf
2
2
===================================================================
3
 
--- glance.orig/etc/glance-api.conf     2012-07-24 20:49:24.649816988 -0700
4
 
+++ glance/etc/glance-api.conf  2012-07-24 20:52:03.309810007 -0700
5
 
@@ -35,7 +35,7 @@
 
3
--- glance-2012.2.1.orig/etc/glance-api.conf    2012-10-19 12:22:20.857638821 -0700
 
4
+++ glance-2012.2.1/etc/glance-api.conf 2012-10-19 12:40:12.729599445 -0700
 
5
@@ -46,7 +46,7 @@
6
6
 # SQLAlchemy connection string for the reference implementation
7
7
 # registry server. Any valid SQLAlchemy connection string is fine.
8
8
 # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
11
11
 
12
12
 # Period in seconds after which SQLAlchemy should reestablish its connection
13
13
 # to the database.
14
 
Index: glance/etc/glance-registry.conf
 
14
Index: glance-2012.2.1/etc/glance-registry.conf
15
15
===================================================================
16
 
--- glance.orig/etc/glance-registry.conf        2012-07-24 20:51:10.497812331 -0700
17
 
+++ glance/etc/glance-registry.conf     2012-07-24 20:51:11.301812296 -0700
18
 
@@ -21,7 +21,7 @@
 
16
--- glance-2012.2.1.orig/etc/glance-registry.conf       2012-10-19 12:22:20.857638821 -0700
 
17
+++ glance-2012.2.1/etc/glance-registry.conf    2012-10-19 12:40:12.733599445 -0700
 
18
@@ -25,7 +25,7 @@
19
19
 # SQLAlchemy connection string for the reference implementation
20
20
 # registry server. Any valid SQLAlchemy connection string is fine.
21
21
 # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine