summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-14 14:05:16 +0000
committerGerrit Code Review <review@openstack.org>2014-10-14 14:05:16 +0000
commit94579bfc81b820380d03703e4e2311b3bd25c022 (patch)
tree6eeeb7671c1ed375953374e23b4fecaf7141ae69
parent619291bd6c5d9775aaa9fcc2b47e8120e6f3443d (diff)
parent9899b6f12f5072787ac72a1a64d4a712db222cb3 (diff)
downloadceilometer-94579bfc81b820380d03703e4e2311b3bd25c022.tar.gz
Merge "Fix recording failure for system pollster" into proposed/juno2014.2.rc32014.2proposed/juno
-rw-r--r--ceilometer/hardware/pollsters/system.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ceilometer/hardware/pollsters/system.py b/ceilometer/hardware/pollsters/system.py
index 9063a9d2..2cfc696d 100644
--- a/ceilometer/hardware/pollsters/system.py
+++ b/ceilometer/hardware/pollsters/system.py
@@ -40,11 +40,11 @@ class SystemCpuIdlePollster(_SystemBase):
class SystemIORawSentPollster(_SystemBase):
IDENTIFIER = 'system_stats.io.outgoing.blocks'
- TYPE = sample.TYPE_CUMULATIVE,
+ TYPE = sample.TYPE_CUMULATIVE
UNIT = 'blocks'
class SystemIORawReceivedPollster(_SystemBase):
IDENTIFIER = 'system_stats.io.incoming.blocks'
- TYPE = sample.TYPE_CUMULATIVE,
+ TYPE = sample.TYPE_CUMULATIVE
UNIT = 'blocks'