diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-01-12 13:46:34 -0600 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-01-12 13:46:34 -0600 |
| commit | f7975676ddc3928caa369464ca2c4191d890f466 (patch) | |
| tree | daef104d33397ecb49be37cf0c32e3c9bb0ac22c /nova/image | |
| parent | 69a2612be4e865063fa5982462673f1843e8befc (diff) | |
| parent | 31f400078bb42ad6084a807288542ebb9f4460db (diff) | |
| download | nova-f7975676ddc3928caa369464ca2c4191d890f466.tar.gz nova-f7975676ddc3928caa369464ca2c4191d890f466.tar.xz nova-f7975676ddc3928caa369464ca2c4191d890f466.zip | |
Merging trunk, small fixes
Diffstat (limited to 'nova/image')
| -rw-r--r-- | nova/image/glance.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index 7252b4720..2f3a031fa 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -43,13 +43,13 @@ class GlanceImageService(service.BaseImageService): def index(self, context): """ - Calls out to Parallax for a list of images available + Calls out to Glance for a list of images available """ return self.client.get_images() def detail(self, context): """ - Calls out to Parallax for a list of detailed image information + Calls out to Glance for a list of detailed image information """ return self.client.get_images_detailed() @@ -92,4 +92,4 @@ class GlanceImageService(service.BaseImageService): """ Clears out all images """ - raise NotImplementedError + pass #raise NotImplementedError |