Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'develop' into neo

  • Loading branch information...
commit 6cc2694268d4c37eb5418a784da591c123765e31 2 parents 07e8704 + 0e2639c
@garnaat garnaat authored
Showing with 6 additions and 3 deletions.
  1. +3 −2 boto/emr/connection.py
  2. +3 −1 boto/route53/record.py
View
5 boto/emr/connection.py
@@ -197,7 +197,7 @@ def modify_instance_groups(self, instance_group_ids, new_sizes):
return self.get_object('ModifyInstanceGroups', params,
ModifyInstanceGroupsResponse, verb='POST')
- def run_jobflow(self, name, log_uri, ec2_keyname=None,
+ def run_jobflow(self, name, log_uri=None, ec2_keyname=None,
availability_zone=None,
master_instance_type='m1.small',
slave_instance_type='m1.small', num_instances=1,
@@ -282,8 +282,9 @@ def run_jobflow(self, name, log_uri, ec2_keyname=None,
params = {}
if action_on_failure:
params['ActionOnFailure'] = action_on_failure
+ if log_uri:
+ params['LogUri'] = log_uri
params['Name'] = name
- params['LogUri'] = log_uri
# Common instance args
common_params = self._build_instance_common_args(ec2_keyname,
View
4 boto/route53/record.py
@@ -1,4 +1,6 @@
# Copyright (c) 2010 Chris Moyer http://coredumped.org/
+# Copyright (c) 2012 Mitch Garnaat http://garnaat.org/
+# Copyright (c) 2012 Amazon.com, Inc. or its affiliates.
# All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -35,7 +37,7 @@ class ResourceRecordSets(ResultSet):
"""
ChangeResourceRecordSetsBody = """<?xml version="1.0" encoding="UTF-8"?>
- <ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2011-05-05/">
+ <ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2012-02-29/">
<ChangeBatch>
<Comment>%(comment)s</Comment>
<Changes>%(changes)s</Changes>
Please sign in to comment.
Something went wrong with that request. Please try again.