diff --git a/Authors b/Authors index 88285d971..3b2cfe0a6 100644 --- a/Authors +++ b/Authors @@ -138,6 +138,7 @@ Masanori Itoh Matt Dietz Matt Stephenson Matthew Hooker +Matthew Joyce Michael Basnight Michael Gundlach Michael Still diff --git a/bin/nova-manage b/bin/nova-manage index a4eaf9d6b..60f9d44a9 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -463,7 +463,7 @@ class ProjectCommands(object): @args('--file', dest="filename", metavar='', help='File name(Default: novarc)') def environment(self, project_id, user_id, filename='novarc'): - """Exports environment variables to an sourcable file""" + """Exports environment variables to a sourceable file""" try: rc = self.manager.get_environment_rc(user_id, project_id) except (exception.UserNotFound, exception.ProjectNotFound) as ex: diff --git a/nova/auth/nova_openldap.schema b/nova/auth/nova_openldap.schema index 539a5c42d..c46a7c2ef 100644 --- a/nova/auth/nova_openldap.schema +++ b/nova/auth/nova_openldap.schema @@ -35,7 +35,7 @@ attributetype ( attributetype ( novaAttrs:4 NAME 'isNovaAdmin' - DESC 'Is user an nova administrator?' + DESC 'Is user a nova administrator?' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py index 1b1b45d63..f45136f76 100644 --- a/nova/openstack/common/cfg.py +++ b/nova/openstack/common/cfg.py @@ -473,7 +473,7 @@ class Opt(object): metavar: the name shown as the argument to a CLI option in --help output help: - an string explaining how the options value is used + a string explaining how the options value is used """ multi = False diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index b7915ed8e..938f60b46 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -228,7 +228,7 @@ class SchedulerManagerTestCase(test.TestCase): *self.fake_args, **self.fake_kwargs) def test_run_instance_exception_puts_instance_in_error_state(self): - """Test that an NoValidHost exception for run_instance puts + """Test that a NoValidHost exception for run_instance puts the instance in ERROR state and eats the exception. """