From bb7d87f0538d69c2db8f316891217733a2b5a443 Mon Sep 17 00:00:00 2001 From: sanjana Date: Tue, 24 May 2016 13:53:35 +0530 Subject: [PATCH] fix typos in our doc, comment and releasenotes Trivial-fix Co-Authored-By: ZhiQiang Fan Change-Id: Ib50e6f7262d5b2bcc70e3821181a25c9d900fa55 --- aodh/keystone_client.py | 2 +- aodh/storage/hbase/utils.py | 2 +- aodh/storage/sqlalchemy/utils.py | 2 +- doc/source/event-alarm.rst | 2 +- doc/source/install/mod_wsgi.rst | 2 +- doc/source/install/uwsgi.rst | 2 +- doc/source/webapi/v2.rst | 4 ++-- .../enable-aodh-service-multi-processes-67ed9a0b7fac69aa.yaml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aodh/keystone_client.py b/aodh/keystone_client.py index b52d92d01..ad07b6a49 100644 --- a/aodh/keystone_client.py +++ b/aodh/keystone_client.py @@ -27,7 +27,7 @@ CFG_GROUP = "service_credentials" def get_session(conf, requests_session=None): - """Get a aodh service credentials auth session.""" + """Get an aodh service credentials auth session.""" auth_plugin = ka_loading.load_auth_from_conf_options(conf, CFG_GROUP) session = ka_loading.load_session_from_conf_options( conf, CFG_GROUP, auth=auth_plugin, session=requests_session diff --git a/aodh/storage/hbase/utils.py b/aodh/storage/hbase/utils.py index 73851ebed..e9b437004 100644 --- a/aodh/storage/hbase/utils.py +++ b/aodh/storage/hbase/utils.py @@ -140,7 +140,7 @@ def make_general_rowkey_scan(rts_start=None, rts_end=None, some_id=None): if not rts_start: # NOTE(idegtiarov): Here we could not use chr > 122 because chr >= 123 # will be quoted and character will be turn in a composition that is - # started with '%' (chr(37)) that lexicographically is less then chr + # started with '%' (chr(37)) that lexicographically is less than chr # of number rts_start = chr(122) end_row = prepare_key(some_id, rts_start) diff --git a/aodh/storage/sqlalchemy/utils.py b/aodh/storage/sqlalchemy/utils.py index d718bac09..2ebaeaa90 100644 --- a/aodh/storage/sqlalchemy/utils.py +++ b/aodh/storage/sqlalchemy/utils.py @@ -32,7 +32,7 @@ class QueryTransformer(object): "in": lambda field_name, values: field_name.in_(values), "=~": lambda field, value: field.op("regexp")(value)} - # operators which are differs for different dialects + # operators which are different for different dialects dialect_operators = {'postgresql': {'=~': (lambda field, value: field.op("~")(value))}} diff --git a/doc/source/event-alarm.rst b/doc/source/event-alarm.rst index aa7ff696e..80e035f32 100644 --- a/doc/source/event-alarm.rst +++ b/doc/source/event-alarm.rst @@ -21,7 +21,7 @@ Aodh allows users to define alarms which can be evaluated based on events passed from other OpenStack services. The events can be emitted when the resources from other OpenStack services have been updated, created or deleted, such as 'compute.instance.reboot.end', 'scheduler.select_destinations.end'. -When creating a alarm with type of "event", an event_type can be specified to +When creating an alarm with type of "event", an event_type can be specified to identify the type of evernt that will trigger the alarm. The event_type field support fuzzy matching with wildcard. Additionally, users can also specify query conditions to filter specific events used to trigger the alarm. diff --git a/doc/source/install/mod_wsgi.rst b/doc/source/install/mod_wsgi.rst index b3dd79ed4..b67dfb304 100644 --- a/doc/source/install/mod_wsgi.rst +++ b/doc/source/install/mod_wsgi.rst @@ -40,7 +40,7 @@ work with a copy of Aodh installed via devstack. ``/etc/httpd/conf.d``. 2. Modify the ``WSGIDaemonProcess`` directive to set the ``user`` and - ``group`` values to a appropriate user on your server. In many + ``group`` values to an appropriate user on your server. In many installations ``aodh`` will be correct. 3. Enable the Aodh site. On deb-based systems:: diff --git a/doc/source/install/uwsgi.rst b/doc/source/install/uwsgi.rst index 06133fc42..d831da3b7 100644 --- a/doc/source/install/uwsgi.rst +++ b/doc/source/install/uwsgi.rst @@ -36,7 +36,7 @@ Create aodh-uwsgi.ini file:: threads = 8 # Make sure the client doesn't try to re-use the connection. add-header = Connection: close - # Set uid and gip to a appropriate user on your server. In many + # Set uid and gip to an appropriate user on your server. In many # installations ``aodh`` will be correct. uid = aodh gid = aodh diff --git a/doc/source/webapi/v2.rst b/doc/source/webapi/v2.rst index 1849233e4..04f49ce1d 100644 --- a/doc/source/webapi/v2.rst +++ b/doc/source/webapi/v2.rst @@ -66,11 +66,11 @@ models. .. note:: The *not* operator has different meaning in Mongo DB and in SQL DB engine. If the *not* operator is applied on a non existent metadata field then - the result depends on the DB engine. For example if + the result depends on the DB engine. For example, if {"not": {"metadata.nonexistent_field" : "some value"}} filter is used in a query the Mongo DB will return every Sample object as *not* operator evaluated true for every Sample where the given field does not exists. See more in the Mongod DB doc. - On the other hand SQL based DB engine will return empty result as the join operation + On the other hand, SQL based DB engine will return empty result as the join operation on the metadata table will return zero rows as the on clause of the join which tries to match on the metadata field name is never fulfilled. diff --git a/releasenotes/notes/enable-aodh-service-multi-processes-67ed9a0b7fac69aa.yaml b/releasenotes/notes/enable-aodh-service-multi-processes-67ed9a0b7fac69aa.yaml index e24abad4a..0938ad3ea 100644 --- a/releasenotes/notes/enable-aodh-service-multi-processes-67ed9a0b7fac69aa.yaml +++ b/releasenotes/notes/enable-aodh-service-multi-processes-67ed9a0b7fac69aa.yaml @@ -1,6 +1,6 @@ --- features: - - Enable aodh services, including aodh-evalutor, aodh-listener and + - Enable aodh services, including aodh-evaluator, aodh-listener and aodh-notifier to run in multiple worker mode. New options are introduced corresponsively as [evaluator]workers,