Merge branch 'release-1.18.60' into develop

* release-1.18.60:
  Bumping version to 1.18.60
  Add changelog entries from botocore

.changes/1.18.60.json

@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``cloudsearch``",
+ "description": "[``botocore``] Adds an additional validation exception for Amazon CloudSearch configuration APIs for better error handling.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ecs``",
+ "description": "[``botocore``] Documentation only update to address tickets.",
+ "type": "api-change"
+ },
+ {
+ "category": "``mediatailor``",
+ "description": "[``botocore``] MediaTailor now supports ad prefetching.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "[``botocore``] EncryptionSupport for InstanceStorageInfo added to DescribeInstanceTypes API",
+ "type": "api-change"
+ }
+]

CHANGELOG.rst

@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.18.60
+=======
+
+* api-change:``cloudsearch``: [``botocore``] Adds an additional validation exception for Amazon CloudSearch configuration APIs for better error handling.
+* api-change:``ecs``: [``botocore``] Documentation only update to address tickets.
+* api-change:``mediatailor``: [``botocore``] MediaTailor now supports ad prefetching.
+* api-change:``ec2``: [``botocore``] EncryptionSupport for InstanceStorageInfo added to DescribeInstanceTypes API
+
+
 1.18.59
 =======
 

boto3/__init__.py

@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.18.59'
+__version__ = '1.18.60'
 
 
 # The default Boto3 session; autoloaded when needed.

setup.cfg

@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
- botocore>=1.21.59,<1.22.0
+ botocore>=1.21.60,<1.22.0
  jmespath>=0.7.1,<1.0.0
  s3transfer>=0.5.0,<0.6.0
 

setup.py

@@ -13,7 +13,7 @@
 
 
 requires = [
- 'botocore>=1.21.59,<1.22.0',
+ 'botocore>=1.21.60,<1.22.0',
  'jmespath>=0.7.1,<1.0.0',
  's3transfer>=0.5.0,<0.6.0'
 ]