From 36f1357791987557972d9bdb3d9fa8f44321e606 Mon Sep 17 00:00:00 2001 From: Joseph Hall Date: Thu, 11 Dec 2014 19:16:13 -0700 Subject: [PATCH] Update AWS/EC2 versions to 2014-10-01 --- salt/cloud/clouds/ec2.py | 2 +- salt/utils/aws.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py index 1a6520c15e..f733df3416 100644 --- a/salt/cloud/clouds/ec2.py +++ b/salt/cloud/clouds/ec2.py @@ -154,7 +154,7 @@ EC2_LOCATIONS = { } DEFAULT_LOCATION = 'us-east-1' -DEFAULT_EC2_API_VERSION = '2013-10-01' +DEFAULT_EC2_API_VERSION = '2014-10-01' EC2_RETRY_CODES = [ 'RequestLimitExceeded', diff --git a/salt/utils/aws.py b/salt/utils/aws.py index fc2137294f..77fbf4e78d 100644 --- a/salt/utils/aws.py +++ b/salt/utils/aws.py @@ -32,7 +32,7 @@ from salt.ext.six.moves.urllib.parse import urlencode, urlparse LOG = logging.getLogger(__name__) DEFAULT_LOCATION = 'us-east-1' -DEFAULT_AWS_API_VERSION = '2014-05-01' +DEFAULT_AWS_API_VERSION = '2014-10-01' AWS_RETRY_CODES = [ 'RequestLimitExceeded', 'InsufficientInstanceCapacity',