Fix merge conflict with upstream.

buildbot · Jun 17, 2014 · 616a2c6 · 616a2c6
1 parent aa0f65f
commit 616a2c6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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