valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18949 from techhat/awsversion

Browse Source 
Update AWS/EC2 versions to 2014-10-01
This commit is contained in:
Thomas S Hatch 2014-12-12 10:00:34 -07:00
commit b9afe18423
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/cloud/clouds/ec2.py
View File

@ -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',

2
salt/utils/aws.py
View File

@ -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',