Update specs to v. 2014.1.1

[openstack-build/ceilometer-build.git] / debian / patches / default-dbconnection-sqlite.patch

diff --git a/debian/patches/default-dbconnection-sqlite.patch b/debian/patches/default-dbconnection-sqlite.patch
index d9883ffb56b1119dd26d9b078a13ed1a8c75e5f8..614d3ab902bcd4ad5d1929696c2775de7ced91d9 100644 (file)
--- a/debian/patches/default-dbconnection-sqlite.patch
+++ b/debian/patches/default-dbconnection-sqlite.patch
@@ -1,8 +1,8 @@
 diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample
-index 4281a67..ff9cbe2 100644
+index 80964a7..7668dea 100644
 --- a/etc/ceilometer/ceilometer.conf.sample
 +++ b/etc/ceilometer/ceilometer.conf.sample
-@@ -134,7 +134,7 @@
+@@ -126,7 +126,7 @@
  #
  
  # The file name to use with SQLite (string value)
@@ -11,7 +11,16 @@ index 4281a67..ff9cbe2 100644
  
  # If True, SQLite uses synchronous mode (boolean value)
  #sqlite_synchronous=true
-@@ -619,7 +619,7 @@
+@@ -148,7 +148,7 @@
+ 
+ 
+ #
+-# Options defined in ceilometer.openstack.common.lockutils
++#Options defined in ceilometer.openstack.common.lockutils
+ #
+ 
+ # Whether to disable inter-process locks. (boolean value)
+@@ -598,7 +598,7 @@
  
  # The backend to use for db (string value)
  # Deprecated group/name - [DEFAULT]/db_backend
@@ -20,7 +29,7 @@ index 4281a67..ff9cbe2 100644
  
  
  #
-@@ -631,7 +631,8 @@
+@@ -610,7 +610,8 @@
  # Deprecated group/name - [DEFAULT]/sql_connection
  # Deprecated group/name - [DATABASE]/sql_connection
  # Deprecated group/name - [sql]/connection