Merge pull request #2433 from kevgliss/elb_marker

Add marker param to describe all ELBs. Fixes #2433.

1 files changed, 11 insertions, 1 deletions

diff --git a/boto/ec2/elb/__init__.py b/boto/ec2/elb/__init__.py
index bb1e2483..9971e060 100644
--- a/boto/ec2/elb/__init__.py
+++ b/boto/ec2/elb/__init__.py
@@ -106,13 +106,19 @@ class ELBConnection(AWSQueryConnection):
         for index, item in enumerate(items):
             params[label % (index + 1)] = item
 
-    def get_all_load_balancers(self, load_balancer_names=None):
+    def get_all_load_balancers(self, load_balancer_names=None, marker=None):
         """
         Retrieve all load balancers associated with your account.
 
         :type load_balancer_names: list
         :keyword load_balancer_names: An optional list of load balancer names.
 
+        :type marker: string
+        :param marker: Use this only when paginating results and only
+            in follow-up request after you've received a response
+            where the results are truncated.  Set this to the value of
+            the Marker element in the response you just received.
+
         :rtype: :py:class:`boto.resultset.ResultSet`
         :return: A ResultSet containing instances of
             :class:`boto.ec2.elb.loadbalancer.LoadBalancer`
@@ -121,6 +127,10 @@ class ELBConnection(AWSQueryConnection):
         if load_balancer_names:
             self.build_list_params(params, load_balancer_names,
                                    'LoadBalancerNames.member.%d')
+
+        if marker:
+            params['Marker'] = marker
+
         return self.get_list('DescribeLoadBalancers', params,
                              [('member', LoadBalancer)])