diff options
| author | Mitch Garnaat <mitch@garnaat.com> | 2012-03-29 06:28:53 -0700 |
|---|---|---|
| committer | Mitch Garnaat <mitch@garnaat.com> | 2012-03-29 06:28:53 -0700 |
| commit | 6cc2694268d4c37eb5418a784da591c123765e31 (patch) | |
| tree | b219ae14208334c943a4aee11e3c4aeddb18dc8f | |
| parent | 07e870487136af00e1d580d281dcd29ef1dd07af (diff) | |
| parent | 0e2639c1a1f0e2c54d87dbb0649176d4413c5cea (diff) | |
| download | boto-6cc2694268d4c37eb5418a784da591c123765e31.tar.gz | |
Merge branch 'develop' into neo
| -rw-r--r-- | boto/emr/connection.py | 5 | ||||
| -rw-r--r-- | boto/route53/record.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/boto/emr/connection.py b/boto/emr/connection.py index 5f5005a5..1f009765 100644 --- a/boto/emr/connection.py +++ b/boto/emr/connection.py @@ -197,7 +197,7 @@ class EmrConnection(AWSQueryConnection): 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 @@ class EmrConnection(AWSQueryConnection): 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, diff --git a/boto/route53/record.py b/boto/route53/record.py index bbd7fcd3..0572ecc4 100644 --- a/boto/route53/record.py +++ b/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> |