diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-29 18:16:09 -0700 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-29 18:16:09 -0700 |
| commit | 2315682856f420ff0b781bead142e1aff82071a4 (patch) | |
| tree | 2ac97f756f654338ebbdcdd60b217d36beee984f /nova/api | |
| parent | 4c16db6ad330b0c3a1bdde098bbdcf958fc23bdf (diff) | |
"Incubator" is no more. Long live "contrib"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/contrib/__init__.py | 2 | ||||
| -rw-r--r-- | nova/api/openstack/extensions.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/api/openstack/contrib/__init__.py b/nova/api/openstack/contrib/__init__.py index e115f1ab9..b42a1d89d 100644 --- a/nova/api/openstack/contrib/__init__.py +++ b/nova/api/openstack/contrib/__init__.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License.import datetime -"""Incubator contains extensions that are shipped with nova. +"""Contrib contains extensions that are shipped with nova. It can't be called 'extensions' because that causes namespacing problems. diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index 6813d85c9..fb1dccb28 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -385,9 +385,9 @@ 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__), "contrib") - if os.path.exists(incubator_path): - self._load_all_extensions_from_path(incubator_path) + contrib_path = os.path.join(os.path.dirname(__file__), "contrib") + if os.path.exists(contrib_path): + self._load_all_extensions_from_path(contrib_path) def _load_all_extensions_from_path(self, path): for f in os.listdir(path): |