summaryrefslogtreecommitdiff
path: root/boto/ec2/elb/listener.py
diff options
context:
space:
mode:
authorkyleknap <kyleknap@amazon.com>2014-10-08 12:41:04 -0700
committerkyleknap <kyleknap@amazon.com>2014-10-08 12:41:04 -0700
commit2517f660f8ef9012708d46da3a36ab967993d2f6 (patch)
treed90281aecdf962a2c7342938ac0a20d57fb74088 /boto/ec2/elb/listener.py
parentff3d8159af3c816303785e023a4182aacb6aabf5 (diff)
parent8f500ce75fea1ba1446195b26dddbe90b52223d8 (diff)
downloadboto-2517f660f8ef9012708d46da3a36ab967993d2f6.tar.gz
Merge branch 'release-2.33.0'2.33.0
Diffstat (limited to 'boto/ec2/elb/listener.py')
-rw-r--r--boto/ec2/elb/listener.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/boto/ec2/elb/listener.py b/boto/ec2/elb/listener.py
index cf26c41c..ed33b131 100644
--- a/boto/ec2/elb/listener.py
+++ b/boto/ec2/elb/listener.py
@@ -80,6 +80,8 @@ class Listener(object):
return self.instance_port
if key == 2:
return self.protocol
- if key == 4:
+ if key == 3:
return self.instance_protocol
+ if key == 4:
+ return self.ssl_certificate_id
raise KeyError