summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
585473e)
Change-Id: I11aae5e3871e21899002558b212b2a45d8d2a6ac
diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample
diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample
-index 80964a7..7668dea 100644
+index 4281a67..ff9cbe2 100644
--- a/etc/ceilometer/ceilometer.conf.sample
+++ b/etc/ceilometer/ceilometer.conf.sample
--- a/etc/ceilometer/ceilometer.conf.sample
+++ b/etc/ceilometer/ceilometer.conf.sample
#
# The file name to use with SQLite (string value)
#
# The file name to use with SQLite (string value)
# If True, SQLite uses synchronous mode (boolean value)
#sqlite_synchronous=true
# If True, SQLite uses synchronous mode (boolean value)
#sqlite_synchronous=true
-@@ -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
# The backend to use for db (string value)
# Deprecated group/name - [DEFAULT]/db_backend
# Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
# Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
Description: Disabled pynsmp.
Author: Chuck Short <zulcss@ubuntu.com>
Forwarded: Not needed.
Description: Disabled pynsmp.
Author: Chuck Short <zulcss@ubuntu.com>
Forwarded: Not needed.
-diff -Naurp ceilometer/requirements.txt ceilometer/requirements.txt
---- ceilometer/requirements.txt 2014-03-06 11:33:29.000000000 -0500
-+++ ceilometer/requirements.txt 2014-03-20 12:49:30.262158266 -0400
-@@ -16,7 +16,6 @@ oslo.config>=1.2.0
- oslo.vmware
+diff --git a/requirements.txt b/requirements.txt
+index 654f568..e7d023d 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -17,7 +17,6 @@ oslo.config>=1.2.0
+ oslo.vmware>=0.2 # Apache-2.0
pbr>=0.6,<1.0
pecan>=0.4.5
-pysnmp>=4.2.1,<5.0.0
python-ceilometerclient>=1.0.6
python-glanceclient>=0.9.0
pbr>=0.6,<1.0
pecan>=0.4.5
-pysnmp>=4.2.1,<5.0.0
python-ceilometerclient>=1.0.6
python-glanceclient>=0.9.0
- python-keystoneclient>=0.6.0
+ python-keystoneclient>=0.7.0