Merge lp:~james-page/ceilometer/refresh-patches into lp:~openstack-ubuntu-testing/ceilometer/grizzly

[James Page]

Refresh for stable/grizzly changes.

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-05 19:34:40 +0000
+++ debian/changelog	2013-05-17 10:49:24 +0000
@@ -1,3 +1,10 @@
+ceilometer (2013.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * d/p/requests-dep.patch: Dropped, included upstream.
+  * d/p/default-dbconnection-sqlite.patch: Refreshed.
+
+ -- James Page <[e-mail]>  Fri, 17 May 2013 11:44:55 +0100
+
 ceilometer (2013.1-0ubuntu1) raring; urgency=low
 
   * New upstream release. 

=== modified file 'debian/patches/default-dbconnection-sqlite.patch'
--- debian/patches/default-dbconnection-sqlite.patch	2013-03-21 16:49:24 +0000
+++ debian/patches/default-dbconnection-sqlite.patch	2013-05-17 10:49:24 +0000
@@ -1,11 +1,11 @@
 --- a/etc/ceilometer/ceilometer.conf.sample
 +++ b/etc/ceilometer/ceilometer.conf.sample
-@@ -262,7 +262,7 @@
- 
+@@ -404,7 +404,7 @@
  ######## defined in ceilometer.storage ########
  
--# database_connection=mongodb://localhost:27017/ceilometer
+ # Database connection string (string value)
+-#database_connection=mongodb://localhost:27017/ceilometer
 +database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
- #### (StrOpt) Database connection string
- 
- 
+ 
+ 
+ ######## defined in ceilometer.storage.sqlalchemy.models ########

=== removed file 'debian/patches/requests-dep.patch'
--- debian/patches/requests-dep.patch	2013-03-21 16:49:24 +0000
+++ debian/patches/requests-dep.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Description: Remove upper bound on requests
-Author: James Page <[e-mail]>
-Forwarded: no
-
---- a/tools/pip-requires
-+++ b/tools/pip-requires
-@@ -15,7 +15,7 @@ python-novaclient>=2.6.10
- python-keystoneclient>=0.2.3
- python-swiftclient
- lxml
--requests<1.0
-+requests
- extras
- wsme>=0.5b1
- pyyaml

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-12 15:01:59 +0000
+++ debian/patches/series	2013-05-17 10:49:24 +0000
@@ -1,3 +1,2 @@
 remove-hbase-support.patch
-requests-dep.patch
 default-dbconnection-sqlite.patch