diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-18 01:17:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-18 01:17:47 +0000 |
| commit | 416edbe2c39a716c7cc42f088f1e58c581cf588c (patch) | |
| tree | 11b6c53d328832e0e19bcddff28a5a3ce1d83326 | |
| parent | b2e4898bd01e3f2eef0670755b83082aa0e76813 (diff) | |
| parent | 186faf363fb75dd7a2f010b97fb414a89aed292a (diff) | |
| download | nova-416edbe2c39a716c7cc42f088f1e58c581cf588c.tar.gz | |
Merge "Rename Openstack to OpenStack"
| -rw-r--r-- | etc/nova/api-paste.ini | 2 | ||||
| -rw-r--r-- | nova/tests/cells/test_cells_weights.py | 2 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_host_filters.py | 2 | ||||
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent | 2 | ||||
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/ipxe | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini index 5a0fc66b64..893e866b0b 100644 --- a/etc/nova/api-paste.ini +++ b/etc/nova/api-paste.ini @@ -53,7 +53,7 @@ paste.filter_factory = nova.api.ec2:Validator.factory paste.app_factory = nova.api.ec2:Executor.factory ############# -# Openstack # +# OpenStack # ############# [composite:osapi_compute] diff --git a/nova/tests/cells/test_cells_weights.py b/nova/tests/cells/test_cells_weights.py index fc46e10279..ba4716e623 100644 --- a/nova/tests/cells/test_cells_weights.py +++ b/nova/tests/cells/test_cells_weights.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012 Openstack Foundation +# Copyright (c) 2012 OpenStack Foundation # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index 59e68b75dc..9127231a21 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -805,7 +805,7 @@ class HostFiltersTestCase(test.NoDBTestCase): self.assertTrue(filt_cls.host_passes(host, filter_properties)) def _do_test_compute_filter_extra_specs(self, ecaps, especs, passes): - """In real Openstack runtime environment,compute capabilities + """In real OpenStack runtime environment,compute capabilities value may be number, so we should use number to do unit test. """ self._stub_service_is_up(True) diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent index a3d2769a6b..65c257ca43 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (c) 2012 Openstack Foundation +# Copyright (c) 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/ipxe b/plugins/xenserver/xenapi/etc/xapi.d/plugins/ipxe index a41acb448e..6217ef5088 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/ipxe +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/ipxe @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (c) 2013 Openstack Foundation +# Copyright (c) 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain |