summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-03-13 16:59:53 +0000
committerGerrit Code Review <review@openstack.org>2012-03-13 16:59:53 +0000
commit094985ea657f590936906829486829846a558f05 (patch)
treecac718a4a296242eae6e884838dcf1417ffbacf4 /nova/api
parent67435c32690c87b355cfbcf9d36b00d60789015e (diff)
parenta3a7464a8de96e219f40049fdd03b41cb8eb65ca (diff)
Merge "Sort results from describe_instances in EC2 API."
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index aa1f2203c..81f0c9a7e 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -1160,7 +1160,8 @@ class CloudController(object):
# always filter out deleted instances
search_opts['deleted'] = False
instances = self.compute_api.get_all(context,
- search_opts=search_opts)
+ search_opts=search_opts,
+ sort_dir='asc')
except exception.NotFound:
instances = []
for instance in instances: