Merge branch 'release-1.22.48'

* release-1.22.48:
  Bumping version to 1.22.48
  Update changelog based on model updates
  minor formatting correction in docs (#6690)

.changes/1.22.48.json

@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``rbin``",
+    "description": "Add EC2 Image recycle bin support.",
+    "type": "api-change"
+  },
+  {
+    "category": "``meteringmarketplace``",
+    "description": "Add CustomerAWSAccountId to ResolveCustomer API response and increase UsageAllocation limit to 2500.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "adds support for AMIs in Recycle Bin",
+    "type": "api-change"
+  },
+  {
+    "category": "``robomaker``",
+    "description": "The release deprecates the use various APIs of RoboMaker Deployment Service in favor of AWS IoT GreenGrass v2.0.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.22.48
+=======
+
+* api-change:``rbin``: Add EC2 Image recycle bin support.
+* api-change:``meteringmarketplace``: Add CustomerAWSAccountId to ResolveCustomer API response and increase UsageAllocation limit to 2500.
+* api-change:``ec2``: adds support for AMIs in Recycle Bin
+* api-change:``robomaker``: The release deprecates the use various APIs of RoboMaker Deployment Service in favor of AWS IoT GreenGrass v2.0.
+
+
 1.22.47
 =======
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.22.47'
+__version__ = '1.22.48'
 
 #
 # Get our data path to be added to botocore's search path

awscli/examples/cloudformation/_package_description.rst

@@ -5,8 +5,8 @@ bucket. The command returns a copy of your template, replacing references to
 local artifacts with the S3 location where the command uploaded the artifacts.
 
 Use this command to quickly upload local artifacts that might be required by
-your template. After you package your template's artifacts, run the deploy
-command to ``deploy`` the returned template.
+your template. After you package your template's artifacts, run the ``deploy``
+command to deploy the returned template.
 
 This command can upload local artifacts referenced in the following places:
 

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.22.'
 # The full version, including alpha/beta/rc tags.
-release = '1.22.47'
+release = '1.22.48'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.cfg

@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.23.47
+        botocore==1.23.48
         docutils>=0.10,<0.16
         s3transfer>=0.5.0,<0.6.0
         PyYAML>=3.10,<5.5

setup.py

@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.23.47',
+    'botocore==1.23.48',
     'docutils>=0.10,<0.16',
     's3transfer>=0.5.0,<0.6.0',
     'PyYAML>=3.10,<5.5',