Refreshed debian/patches/fix-default-db.patch

Rewritten-From: cdc8202b2b311abb7c4533e16ae58d8a79bb97f3

diff --git a/trusty/debian/patches/fix-default-db.patch b/trusty/debian/patches/fix-default-db.patch
index ea1084333d618a91a4cca5cdbac6264e569ce20e..563c1860ee31dadd257cd819169a7e605cb5c958 100644 (file)
--- a/trusty/debian/patches/fix-default-db.patch
+++ b/trusty/debian/patches/fix-default-db.patch
@@ -6,14 +6,14 @@ Last-Update: 2014-07-01
 
 Index: heat/etc/heat/heat.conf.sample
 ===================================================================
---- heat.orig/etc/heat/heat.conf.sample        2014-07-31 23:00:21.000000000 +0800
-+++ heat/etc/heat/heat.conf.sample     2014-07-31 23:12:03.000000000 +0800
-@@ -858,7 +858,7 @@
+--- heat.orig/etc/heat/heat.conf.sample        2014-09-22 16:59:01.000000000 +0800
++++ heat/etc/heat/heat.conf.sample     2014-09-22 17:16:09.000000000 +0800
+@@ -865,7 +865,7 @@
  # Deprecated group/name - [DEFAULT]/sql_connection
  # Deprecated group/name - [DATABASE]/sql_connection
  # Deprecated group/name - [sql]/connection
 -#connection=<None>
 +connection=sqlite:///var/lib/heat/heatdb
  
- # The SQL mode to be used for MySQL sessions. This option,
- # including the default, overrides any server-set SQL mode. To
+ # The SQLAlchemy connection string to use to connect to the
+ # slave database. (string value)