Merge "correct docstring in storage module"

This commit is contained in:
Jenkins 2016-03-22 11:22:24 +00:00 committed by Gerrit Code Review
commit 09aec58d7e
6 changed files with 6 additions and 6 deletions

View File

@ -153,7 +153,7 @@ class Connection(object):
"""Write the data to the backend storage system. """Write the data to the backend storage system.
:param data: a dictionary such as returned by :param data: a dictionary such as returned by
ceilometer.meter.meter_message_from_counter ceilometer.publisher.utils.meter_message_from_counter
All timestamps must be naive utc datetime object. All timestamps must be naive utc datetime object.
""" """

View File

@ -219,7 +219,7 @@ class Connection(pymongo_base.Connection):
"""Write the data to the backend storage system. """Write the data to the backend storage system.
:param data: a dictionary such as returned by :param data: a dictionary such as returned by
ceilometer.meter.meter_message_from_counter ceilometer.publisher.utils.meter_message_from_counter
""" """
# Record the updated resource metadata # Record the updated resource metadata
data = copy.deepcopy(data) data = copy.deepcopy(data)

View File

@ -144,7 +144,7 @@ class Connection(hbase_base.Connection, base.Connection):
"""Write the data to the backend storage system. """Write the data to the backend storage system.
:param data: a dictionary such as returned by :param data: a dictionary such as returned by
ceilometer.meter.meter_message_from_counter ceilometer.publisher.utils.meter_message_from_counter
""" """
with self.conn_pool.connection() as conn: with self.conn_pool.connection() as conn:
resource_table = conn.table(self.RESOURCE_TABLE) resource_table = conn.table(self.RESOURCE_TABLE)

View File

@ -104,7 +104,7 @@ class Connection(base.Connection):
"""Return an iterable of samples. """Return an iterable of samples.
Items are created by Items are created by
:func:`ceilometer.meter.meter_message_from_counter`. ceilometer.publisher.utils.meter_message_from_counter.
""" """
return [] return []

View File

@ -245,7 +245,7 @@ class Connection(pymongo_base.Connection):
"""Write the data to the backend storage system. """Write the data to the backend storage system.
:param data: a dictionary such as returned by :param data: a dictionary such as returned by
ceilometer.meter.meter_message_from_counter ceilometer.publisher.utils.meter_message_from_counter
""" """
# Record the updated resource metadata - we use $setOnInsert to # Record the updated resource metadata - we use $setOnInsert to
# unconditionally insert sample timestamps and resource metadata # unconditionally insert sample timestamps and resource metadata

View File

@ -332,7 +332,7 @@ class Connection(base.Connection):
"""Write the data to the backend storage system. """Write the data to the backend storage system.
:param data: a dictionary such as returned by :param data: a dictionary such as returned by
ceilometer.meter.meter_message_from_counter ceilometer.publisher.utils.meter_message_from_counter
""" """
engine = self._engine_facade.get_engine() engine = self._engine_facade.get_engine()
with engine.begin() as conn: with engine.begin() as conn: