+++ /dev/null
-Description: mongodb, db2: do not print full URL in logs
- The full URL used to connect to MongoDB or DB2 might contains sensitive
- information such as username and password, so it's better to not print it at
- all. Instead, just print the hosts that are being connected to.
-Author: Julien Danjou <julien@danjou.info>
-Date: Wed, 30 Oct 2013 14:49:33 +0000 (+0100)
-Origin: upstream, https://review.openstack.org/#/c/56396/
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fceilometer.git;a=commitdiff_plain;h=ef6c659588feff646343fd80ba3d420d9c06404b
-Bug-Ubuntu: Bug-Ubuntu: https://launchpad.net/bugs/1244476
-Bug-Debian: Bug-Debian: http://bugs.debian.org/730227
-
-diff --git a/ceilometer/storage/impl_db2.py b/ceilometer/storage/impl_db2.py
-index b44f424..5a72c1c 100644
---- a/ceilometer/storage/impl_db2.py
-+++ b/ceilometer/storage/impl_db2.py
-@@ -153,7 +153,8 @@ class ConnectionPool(object):
- client = self._pool.get(pool_key)()
- if client:
- return client
-- LOG.info('connecting to MongoDB on %s', url)
-+ LOG.info(_('Connecting to DB2 on %s'),
-+ connection_options['nodelist'])
- client = pymongo.MongoClient(
- url,
- safe=True)
-diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py
-index 9ca881c..9640ebe 100644
---- a/ceilometer/storage/impl_mongodb.py
-+++ b/ceilometer/storage/impl_mongodb.py
-@@ -155,7 +155,8 @@ class ConnectionPool(object):
- client = self._pool.get(pool_key)()
- if client:
- return client
-- LOG.info('connecting to MongoDB on %s', url)
-+ LOG.info(_('Connecting to MongoDB on %s'),
-+ connection_options['nodelist'])
- client = pymongo.MongoClient(
- url,
- safe=True)
-Description: Requirement is wrong
+Description: Removes SQLAlchemy restriction
Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2013-09-22
+Forwarded: not-needed
+Last-Update: 2013-12-09
---- ceilometer-2013.2~b3.orig/requirements.txt
-+++ ceilometer-2013.2~b3/requirements.txt
-@@ -3,7 +3,7 @@ WebOb>=1.2.3,<1.3
- kombu>=2.4.8
- iso8601>=0.1.4
- argparse
+--- ceilometer-2014.1~b1.orig/requirements.txt
++++ ceilometer-2014.1~b1/requirements.txt
+@@ -23,7 +23,7 @@ python-swiftclient>=1.5
+ PyYAML>=3.1.0
+ requests>=1.1
+ six>=1.4.1
-SQLAlchemy>=0.7.8,<=0.7.99
+SQLAlchemy>=0.7.8
- sqlalchemy-migrate>=0.7.2
- alembic>=0.4.1
- netaddr
+ sqlalchemy-migrate>=0.8.2
+ stevedore>=0.12
+ WebOb>=1.2.3,<1.3