From 616a2c699d381627bda68b88b4eb11af2db9fc4e Mon Sep 17 00:00:00 2001 From: "Dave B." Date: Mon, 16 Jun 2014 20:07:02 -0400 Subject: [PATCH] Fix merge conflict with upstream. --- master/buildbot/buildslave/ec2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/master/buildbot/buildslave/ec2.py b/master/buildbot/buildslave/ec2.py index 009fa0c760f..6d7e28f1686 100644 --- a/master/buildbot/buildslave/ec2.py +++ b/master/buildbot/buildslave/ec2.py @@ -60,7 +60,7 @@ def __init__(self, name, password, instance_type, ami=None, build_wait_timeout=60 * 10, properties={}, locks=None, spot_instance=False, max_spot_price=1.6, volumes=[], placement=None, price_multiplier=1.2, tags={}, - retry_price_adjustment=1, product_description='Linux/UNIX'):): + retry_price_adjustment=1, product_description='Linux/UNIX'): AbstractLatentBuildSlave.__init__( self, name, password, max_builds, notify_on_missing, @@ -341,7 +341,7 @@ def _submit_request(self): '%Y-%m-%dT%H:%M:%SZ', timestamp_yesterday) spot_prices = self.conn.get_spot_price_history( start_time=spot_history_starttime, - product_description='Linux/UNIX (Amazon VPC)', + product_description=self.product_description, availability_zone=self.placement) price_sum = 0.0 price_count = 0