diff --git a/api-ref/source/os-cells.inc b/api-ref/source/os-cells.inc index 8e199360be21..b9ddcbb7229d 100644 --- a/api-ref/source/os-cells.inc +++ b/api-ref/source/os-cells.inc @@ -103,7 +103,7 @@ Normal response code: 200 Error response codes: badRequest(400), unauthorized(401), forbidden(403), NotImplemented(501) -.. TODO(cdent): this is weird, data is stuctured entirely differently. +.. TODO(cdent): this is weird, data is structured entirely differently. Show Cell Data ============== diff --git a/nova/conf/workarounds.py b/nova/conf/workarounds.py index e5db431bf82c..7d02940791e3 100644 --- a/nova/conf/workarounds.py +++ b/nova/conf/workarounds.py @@ -117,7 +117,7 @@ are ignored. This is an advanced feature which allows the hypervisor to signal to the compute service that an unexpected state change has occurred in an instance and that the instance can be shutdown automatically. Unfortunately, this can -race in some conditions, for exmaple in reboot operations or when the compute +race in some conditions, for example in reboot operations or when the compute service or when host is rebooted (planned or due to an outage). If such races are common, then it is advisable to disable this feature. diff --git a/nova/tests/unit/api/openstack/compute/test_server_external_events.py b/nova/tests/unit/api/openstack/compute/test_server_external_events.py index b40efda50fa4..87ca0abfa647 100644 --- a/nova/tests/unit/api/openstack/compute/test_server_external_events.py +++ b/nova/tests/unit/api/openstack/compute/test_server_external_events.py @@ -145,7 +145,7 @@ class ServerExternalEventsTestV21(test.NoDBTestCase): self.assertRaises(self.invalid_error, self.api.create, self.req, body=body) - def test_create_unkown_events(self): + def test_create_unknown_events(self): self.event_1['name'] = 'unkown_event' body = {'events': self.event_1} self.assertRaises(self.invalid_error,