summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-21 20:56:49 +0000
committerGerrit Code Review <review@openstack.org>2013-02-21 20:56:49 +0000
commitf13ce11ba634764f41f05938b0e3cee3469a9a0e (patch)
tree2ec5b95d39c29c250bae00f6429363c1394a10a5
parent1a8b6f07ac625fa5ea3acce3b16dd9ae1c3a9ad2 (diff)
parent3d4837e4e7273c509120ee1364fe73ca557a218e (diff)
downloadnova-f13ce11ba634764f41f05938b0e3cee3469a9a0e.tar.gz
nova-f13ce11ba634764f41f05938b0e3cee3469a9a0e.tar.xz
nova-f13ce11ba634764f41f05938b0e3cee3469a9a0e.zip
Merge "Spelling: compatable=>compatible"
-rw-r--r--nova/db/sqlalchemy/api.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 360bd1b3a..1baa192a3 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2818,7 +2818,7 @@ def volume_get_iscsi_target_num(context, volume_id):
@require_context
def ec2_volume_create(context, volume_uuid, id=None):
- """Create ec2 compatable volume by provided uuid."""
+ """Create ec2 compatible volume by provided uuid."""
ec2_volume_ref = models.VolumeIdMapping()
ec2_volume_ref.update({'uuid': volume_uuid})
if id is not None:
@@ -2855,7 +2855,7 @@ def get_volume_uuid_by_ec2_id(context, ec2_id, session=None):
@require_context
def ec2_snapshot_create(context, snapshot_uuid, id=None):
- """Create ec2 compatable snapshot by provided uuid."""
+ """Create ec2 compatible snapshot by provided uuid."""
ec2_snapshot_ref = models.SnapshotIdMapping()
ec2_snapshot_ref.update({'uuid': snapshot_uuid})
if id is not None:
@@ -4640,7 +4640,7 @@ def action_event_get_by_id(context, action_id, event_id):
@require_context
def ec2_instance_create(context, instance_uuid, id=None):
- """Create ec2 compatable instance by provided uuid."""
+ """Create ec2 compatible instance by provided uuid."""
ec2_instance_ref = models.InstanceIdMapping()
ec2_instance_ref.update({'uuid': instance_uuid})
if id is not None: