Merge branch 'release-1.18.47' into develop

aws-sdk-python-automation · aws-sdk-python-automation · commit ce48812f901b · 2021-09-23T18:13:11.000Z
* release-1.18.47:
  Bumping version to 1.18.47
  Add changelog entries from botocore
diff --git a/.changes/1.18.47.json b/.changes/1.18.47.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``mediaconvert``",
+    "description": "[``botocore``] This release adds style and positioning support for caption or subtitle burn-in from rich text sources such as TTML. This release also introduces configurable image-based trick play track generation.",
+    "type": "api-change"
+  },
+  {
+    "category": "``appsync``",
+    "description": "[``botocore``] Documented the new OpenSearchServiceDataSourceConfig data type. Added deprecation notes to the ElasticsearchDataSourceConfig data type.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ssm``",
+    "description": "[``botocore``] Added cutoff behavior support for preventing new task invocations from starting when the maintenance window cutoff time is reached.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.18.47
+=======
+
+* api-change:``mediaconvert``: [``botocore``] This release adds style and positioning support for caption or subtitle burn-in from rich text sources such as TTML. This release also introduces configurable image-based trick play track generation.
+* api-change:``appsync``: [``botocore``] Documented the new OpenSearchServiceDataSourceConfig data type. Added deprecation notes to the ElasticsearchDataSourceConfig data type.
+* api-change:``ssm``: [``botocore``] Added cutoff behavior support for preventing new task invocations from starting when the maintenance window cutoff time is reached.
+
+
 1.18.46
 =======
 
diff --git a/boto3/__init__.py b/boto3/__init__.py
@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.18.46'
+__version__ = '1.18.47'
 
 
 # The default Boto3 session; autoloaded when needed.
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-    botocore>=1.21.46,<1.22.0
+    botocore>=1.21.47,<1.22.0
     jmespath>=0.7.1,<1.0.0
     s3transfer>=0.5.0,<0.6.0
 
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 
 requires = [
-    'botocore>=1.21.46,<1.22.0',
+    'botocore>=1.21.47,<1.22.0',
     'jmespath>=0.7.1,<1.0.0',
     's3transfer>=0.5.0,<0.6.0'
 ]

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`
`16`	`16`	`requires = [`
`17`		`- 'botocore>=1.21.46,<1.22.0',`
	`17`	`+ 'botocore>=1.21.47,<1.22.0',`
`18`	`18`	`'jmespath>=0.7.1,<1.0.0',`
`19`	`19`	`'s3transfer>=0.5.0,<0.6.0'`
`20`	`20`	`]`