summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-29 18:08:17 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-29 18:08:17 -0700
commit9c8300c98239c181cc66740bf18717f0488a0743 (patch)
tree47f2fa1746413f40a0c4f2ea8c6c13d4f271ab2e /nova/api
parentf0cd8a993d235fddbfb9478b69a77f4ed32f6dff (diff)
Renamed incubator => contrib
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/contrib/__init__.py (renamed from nova/api/openstack/incubator/__init__.py)0
-rw-r--r--nova/api/openstack/contrib/volumes.py (renamed from nova/api/openstack/incubator/volumes.py)0
-rw-r--r--nova/api/openstack/extensions.py4
3 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/incubator/__init__.py b/nova/api/openstack/contrib/__init__.py
index e115f1ab9..e115f1ab9 100644
--- a/nova/api/openstack/incubator/__init__.py
+++ b/nova/api/openstack/contrib/__init__.py
diff --git a/nova/api/openstack/incubator/volumes.py b/nova/api/openstack/contrib/volumes.py
index 6efacce52..6efacce52 100644
--- a/nova/api/openstack/incubator/volumes.py
+++ b/nova/api/openstack/contrib/volumes.py
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index 631275235..cba151fb6 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -378,7 +378,7 @@ class ExtensionManager(object):
widgets.py the extension class within that module should be
'Widgets'.
- In addition, extensions are loaded from the 'incubator' directory.
+ In addition, extensions are loaded from the 'contrib' directory.
See nova/tests/api/openstack/extensions/foxinsocks.py for an example
extension implementation.
@@ -387,7 +387,7 @@ class ExtensionManager(object):
if os.path.exists(self.path):
self._load_all_extensions_from_path(self.path)
- incubator_path = os.path.join(os.path.dirname(__file__), "incubator")
+ incubator_path = os.path.join(os.path.dirname(__file__), "contrib")
if os.path.exists(incubator_path):
self._load_all_extensions_from_path(incubator_path)