Merge branch 'release-1.18.48' into develop

aws-sdk-python-automation · aws-sdk-python-automation · commit 4d4aa02f8621 · 2021-09-24T18:17:35.000Z
* release-1.18.48:
  Bumping version to 1.18.48
  Add changelog entries from botocore
diff --git a/.changes/1.18.48.json b/.changes/1.18.48.json
@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``license-manager``",
+    "description": "[``botocore``] AWS License Manager now allows customers to get the LicenseArn in the Checkout API Response.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "[``botocore``] DescribeInstances now returns Platform Details, Usage Operation, and Usage Operation Update Time.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.18.48
+=======
+
+* api-change:``license-manager``: [``botocore``] AWS License Manager now allows customers to get the LicenseArn in the Checkout API Response.
+* api-change:``ec2``: [``botocore``] DescribeInstances now returns Platform Details, Usage Operation, and Usage Operation Update Time.
+
+
 1.18.47
 =======
 
diff --git a/boto3/__init__.py b/boto3/__init__.py
@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.18.47'
+__version__ = '1.18.48'
 
 
 # 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.47,<1.22.0
+    botocore>=1.21.48,<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
@@ -13,7 +13,7 @@
 
 
 requires = [
-    'botocore>=1.21.47,<1.22.0',
+    'botocore>=1.21.48,<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
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`
`15`	`15`	`requires = [`
`16`		`- 'botocore>=1.21.47,<1.22.0',`
	`16`	`+ 'botocore>=1.21.48,<1.22.0',`
`17`	`17`	`'jmespath>=0.7.1,<1.0.0',`
`18`	`18`	`'s3transfer>=0.5.0,<0.6.0'`
`19`	`19`	`]`