Merge branch 'release-1.25.69' into develop

* release-1.25.69:
  Bumping version to 1.25.69
  Update changelog based on model updates

Author: aws-sdk-python-automation

.changes/1.25.69.json

@@ -0,0 +1,42 @@
+[
+  {
+    "category": "``dataexchange``",
+    "description": "Documentation updates for AWS Data Exchange.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "Documentation updates for Amazon EC2.",
+    "type": "api-change"
+  },
+  {
+    "category": "``eks``",
+    "description": "Adds support for EKS Addons ResolveConflicts \"preserve\" flag. Also adds new update failed status for EKS Addons.",
+    "type": "api-change"
+  },
+  {
+    "category": "``fsx``",
+    "description": "Documentation update for Amazon FSx.",
+    "type": "api-change"
+  },
+  {
+    "category": "``inspector2``",
+    "description": "This release adds new fields like fixAvailable, fixedInVersion and remediation to the finding model. The requirement to have vulnerablePackages in the finding model has also been removed. The documentation has been updated to reflect these changes.",
+    "type": "api-change"
+  },
+  {
+    "category": "``iotsitewise``",
+    "description": "Allow specifying units in Asset Properties",
+    "type": "api-change"
+  },
+  {
+    "category": "``sagemaker``",
+    "description": "SageMaker Hosting now allows customization on ML instance storage volume size, model data download timeout and inference container startup ping health check timeout for each ProductionVariant in CreateEndpointConfig API.",
+    "type": "api-change"
+  },
+  {
+    "category": "``sns``",
+    "description": "Amazon SNS introduces the Data Protection Policy APIs, which enable customers to attach a data protection policy to an SNS topic. This allows topic owners to enable the new message data protection feature to audit and block sensitive data that is exchanged through their topics.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,19 @@
 CHANGELOG
 =========
 
+1.25.69
+=======
+
+* api-change:``dataexchange``: Documentation updates for AWS Data Exchange.
+* api-change:``ec2``: Documentation updates for Amazon EC2.
+* api-change:``eks``: Adds support for EKS Addons ResolveConflicts "preserve" flag. Also adds new update failed status for EKS Addons.
+* api-change:``fsx``: Documentation update for Amazon FSx.
+* api-change:``inspector2``: This release adds new fields like fixAvailable, fixedInVersion and remediation to the finding model. The requirement to have vulnerablePackages in the finding model has also been removed. The documentation has been updated to reflect these changes.
+* api-change:``iotsitewise``: Allow specifying units in Asset Properties
+* api-change:``sagemaker``: SageMaker Hosting now allows customization on ML instance storage volume size, model data download timeout and inference container startup ping health check timeout for each ProductionVariant in CreateEndpointConfig API.
+* api-change:``sns``: Amazon SNS introduces the Data Protection Policy APIs, which enable customers to attach a data protection policy to an SNS topic. This allows topic owners to enable the new message data protection feature to audit and block sensitive data that is exchanged through their topics.
+
+
 1.25.68
 =======
 

awscli/__init__.py

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

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.25.'
 # The full version, including alpha/beta/rc tags.
-release = '1.25.68'
+release = '1.25.69'
 
 # 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.27.67
+        botocore==1.27.68
         docutils>=0.10,<0.17
         s3transfer>=0.6.0,<0.7.0
         PyYAML>=3.10,<5.5

setup.py

@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.27.67',
+    'botocore==1.27.68',
     'docutils>=0.10,<0.17',
     's3transfer>=0.6.0,<0.7.0',
     'PyYAML>=3.10,<5.5',