Merge "wrong document location"

This commit is contained in:
Jenkins 2017-07-27 19:05:25 +00:00 committed by Gerrit Code Review
commit c83d15fd25

View File

@ -62,7 +62,7 @@ Notifications mechanism uses plugins as well, for instance
:class:`ceilometer.telemetry.notifications.TelemetryApiPost` plugin :class:`ceilometer.telemetry.notifications.TelemetryApiPost` plugin
which is defined in the ``ceilometer/telemetry/notifications`` folder, Though which is defined in the ``ceilometer/telemetry/notifications`` folder, Though
in most cases, this is not needed. A meter definition can be directly added in most cases, this is not needed. A meter definition can be directly added
to :file:`ceilometer/meter/data/meter.yaml` to match the event type. For to :file:`ceilometer/data/meters.d/meters.yaml` to match the event type. For
more information, see the :ref:`add_new_meters` page. more information, see the :ref:`add_new_meters` page.
We are using these two existing plugins as examples as the first one provides We are using these two existing plugins as examples as the first one provides
@ -119,7 +119,7 @@ Notifications
.. note:: .. note::
This should only be needed for cases where a complex arithmetic or This should only be needed for cases where a complex arithmetic or
non-primitive data types are used. In most cases, adding a meter non-primitive data types are used. In most cases, adding a meter
definition to the :file:`ceilometer/meter/data/meter.yaml` should definition to the :file:`ceilometer/data/meters.d/meters.yaml` should
suffice. suffice.
Notifications are defined as subclass of the Notifications are defined as subclass of the
@ -176,7 +176,7 @@ Tests
Any new plugin or agent contribution will only be accepted into the project if Any new plugin or agent contribution will only be accepted into the project if
provided together with unit tests. Those are defined for the compute agent provided together with unit tests. Those are defined for the compute agent
plugins in the directory ``tests/compute`` and for the agent itself in plugins in the directory ``tests/unit/compute`` and for the agent itself in
``test/agent``. Unit tests are run in a continuous integration process for ``tests/unit/agent``. Unit tests are run in a continuous integration process for
each commit made to the project, thus ensuring as best as possible that a given each commit made to the project, thus ensuring as best as possible that a given
patch has no side effect to the rest of the project. patch has no side effect to the rest of the project.