summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorMark Washenberger <mark.washenberger@rackspace.com>2012-09-19 18:41:03 +0000
committerMark Washenberger <mark.washenberger@rackspace.com>2012-09-19 19:14:33 +0000
commit09b903ed5e3306cf200328f41ce6df371923d03d (patch)
tree67f7b29fa9f0a7f5e20f65ccd04a0f4f122c8304 /nova/exception.py
parent8473bb4cf93eb713ef42fdc87767aa938f36b43e (diff)
Fix marker pagination for /servers
Fixes bug 1053028. Recent changes to pagination required passing in full sqlalchemy objects into paginate_query. However, calls to paginate_query were passing in strings. Change-Id: Ib1396a78a12aef1a9cdc31f3624af30f19da44b5
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/exception.py b/nova/exception.py
index c9f339e6c..4de43c366 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -1067,6 +1067,10 @@ class InstanceNotFound(NotFound):
message = _("Instance %(instance_id)s could not be found.")
+class MarkerNotFound(NotFound):
+ message = _("Marker %(marker)s could not be found.")
+
+
class InvalidInstanceIDMalformed(Invalid):
message = _("Invalid id: %(val)s (expecting \"i-...\").")