chore: resolve merge conflicts

Resolved merge conflicts when merging master into feat_account_id_endpoint_support branch.

.changes/3.314.5

@@ -0,0 +1,32 @@
+[
+    {
+        "type": "api-change",
+        "category": "DirectConnect",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    },
+    {
+        "type": "api-change",
+        "category": "CostandUsageReportService",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    },
+    {
+        "type": "api-change",
+        "category": "Artifact",
+        "description": "This release adds an acceptanceType field to the ReportSummary structure (used in the ListReports API response)."
+    },
+    {
+        "type": "api-change",
+        "category": "ElasticTranscoder",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    },
+    {
+        "type": "api-change",
+        "category": "Athena",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    },
+    {
+        "type": "api-change",
+        "category": "OpenSearchService",
+        "description": "This release enables customers to use JSON Web Tokens (JWT) for authentication on their Amazon OpenSearch Service domains."
+    }
+]

.changes/3.314.6

@@ -0,0 +1,47 @@
+[
+    {
+        "type": "enhancement",
+        "category": "DynamoDB",
+        "description": "Doc-only update for DynamoDB. Fixed Important note in 6 Global table APIs - CreateGlobalTable, DescribeGlobalTable, DescribeGlobalTableSettings, ListGlobalTables, UpdateGlobalTable, and UpdateGlobalTableSettings."
+    },
+    {
+        "type": "api-change",
+        "category": "BedrockRuntime",
+        "description": "This release adds document support to Converse and ConverseStream APIs"
+    },
+    {
+        "type": "api-change",
+        "category": "Glue",
+        "description": "Fix Glue paginators for Jobs, JobRuns, Triggers, Blueprints and Workflows."
+    },
+    {
+        "type": "enhancement",
+        "category": "SecurityHub",
+        "description": "Documentation updates for Security Hub"
+    },
+    {
+        "type": "api-change",
+        "category": "SageMaker",
+        "description": "Adds support for model references in Hub service, and adds support for cross-account access of Hubs"
+    },
+    {
+        "type": "api-change",
+        "category": "CostOptimizationHub",
+        "description": "This release enables AWS Cost Optimization Hub to show cost optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL."
+    },
+    {
+        "type": "api-change",
+        "category": "IVSRealTime",
+        "description": "IVS Real-Time now offers customers the ability to record individual stage participants to S3."
+    },
+    {
+        "type": "api-change",
+        "category": "ComputeOptimizer",
+        "description": "This release enables AWS Compute Optimizer to analyze and generate optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL."
+    },
+    {
+        "type": "api-change",
+        "category": "CodeArtifact",
+        "description": "Add support for the Cargo package format."
+    }
+]

.changes/3.314.7

@@ -0,0 +1,32 @@
+[
+    {
+        "type": "api-change",
+        "category": "SSM",
+        "description": "Add sensitive trait to SSM IPAddress property for CloudTrail redaction"
+    },
+    {
+        "type": "api-change",
+        "category": "EC2",
+        "description": "Fix EC2 multi-protocol info in models."
+    },
+    {
+        "type": "api-change",
+        "category": "BedrockRuntime",
+        "description": "Increases Converse API's document name length"
+    },
+    {
+        "type": "api-change",
+        "category": "QBusiness",
+        "description": "Allow enable\/disable Q Apps when creating\/updating a Q application; Return the Q Apps enablement information when getting a Q application."
+    },
+    {
+        "type": "api-change",
+        "category": "CustomerProfiles",
+        "description": "This release includes changes to ProfileObjectType APIs, adds functionality top set and get capacity for profile object types."
+    },
+    {
+        "type": "api-change",
+        "category": "WorkSpacesWeb",
+        "description": "Added ability to enable DeepLinking functionality on a Portal via UserSettings as well as added support for IdentityProvider resource tagging."
+    }
+]

.changes/3.314.8

@@ -0,0 +1,22 @@
+[
+    {
+        "type": "api-change",
+        "category": "EC2",
+        "description": "This release is for the launch of the new u7ib-12tb.224xlarge, R8g, c7gn.metal and mac2-m1ultra.metal instance types"
+    },
+    {
+        "type": "api-change",
+        "category": "AutoScaling",
+        "description": "Doc only update for Auto Scaling's TargetTrackingMetricDataQuery"
+    },
+    {
+        "type": "api-change",
+        "category": "NetworkManager",
+        "description": "This is model changes & documentation update for the Asynchronous Error Reporting feature for AWS Cloud WAN. This feature allows customers to view errors that occur while their resources are being provisioned, enabling customers to fix their resources without needing external support."
+    },
+    {
+        "type": "api-change",
+        "category": "WorkSpacesThinClient",
+        "description": "This release adds the deviceCreationTags field to CreateEnvironment API input, UpdateEnvironment API input and GetEnvironment API output."
+    }
+]

.changes/3.315.0

@@ -0,0 +1,27 @@
+[
+    {
+        "type": "api-change",
+        "category": "ControlTower",
+        "description": "Added ListLandingZoneOperations API."
+    },
+    {
+        "type": "api-change",
+        "category": "EKS",
+        "description": "Added support for disabling unmanaged addons during cluster creation."
+    },
+    {
+        "type": "api-change",
+        "category": "IVSRealTime",
+        "description": "IVS Real-Time now offers customers the ability to upload public keys for customer vended participant tokens."
+    },
+    {
+        "type": "api-change",
+        "category": "KinesisAnalyticsV2",
+        "description": "This release adds support for new ListApplicationOperations and DescribeApplicationOperation APIs. It adds a new configuration to enable system rollbacks, adds field ApplicationVersionCreateTimestamp for clarity and improves support for pagination for APIs."
+    },
+    {
+        "type": "api-change",
+        "category": "OpenSearchService",
+        "description": "This release adds support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains, and provides visibility into the current state of the setup or tear-down."
+    }
+]

.changes/3.315.1

@@ -0,0 +1,57 @@
+[
+    {
+        "type": "api-change",
+        "category": "ElastiCache",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    },
+    {
+        "type": "api-change",
+        "category": "ChimeSDKMediaPipelines",
+        "description": "Added Amazon Transcribe multi language identification to Chime SDK call analytics. Enabling customers sending single stream audio to generate call recordings using Chime SDK call analytics"
+    },
+    {
+        "type": "api-change",
+        "category": "SageMaker",
+        "description": "Add capability for Admins to customize Studio experience for the user by showing or hiding Apps and MLTools."
+    },
+    {
+        "type": "enhancement",
+        "category": "CloudFront",
+        "description": "Doc only update for CloudFront that fixes customer-reported issue"
+    },
+    {
+        "type": "api-change",
+        "category": "MQ",
+        "description": "This release makes the EngineVersion field optional for both broker and configuration and uses the latest available version by default. The AutoMinorVersionUpgrade field is also now optional for broker creation and defaults to 'true'."
+    },
+    {
+        "type": "api-change",
+        "category": "WorkSpaces",
+        "description": "Added support for WorkSpaces Pools."
+    },
+    {
+        "type": "api-change",
+        "category": "QuickSight",
+        "description": "Adding support for Repeating Sections, Nested Filters"
+    },
+    {
+        "type": "api-change",
+        "category": "ApplicationAutoScaling",
+        "description": "Amazon WorkSpaces customers can now use Application Auto Scaling to automatically scale the number of virtual desktops in a WorkSpaces pool."
+    },
+    {
+        "type": "api-change",
+        "category": "QConnect",
+        "description": "Adds CreateContentAssociation, ListContentAssociations, GetContentAssociation, and DeleteContentAssociation APIs."
+    },
+    {
+        "type": "api-change",
+        "category": "DataZone",
+        "description": "This release supports the data lineage feature of business data catalog in Amazon DataZone."
+    },
+    {
+        "type": "enhancement",
+        "category": "RDS",
+        "description": "Updates Amazon RDS documentation for TAZ export to S3."
+    }
+]

.changes/3.315.2

@@ -0,0 +1,47 @@
+[
+    {
+        "type": "api-change",
+        "category": "Glue",
+        "description": "Added AttributesToGet parameter to Glue GetDatabases, allowing caller to limit output to include only the database name."
+    },
+    {
+        "type": "api-change",
+        "category": "CloudHSMV2",
+        "description": "Added 3 new APIs to support backup sharing: GetResourcePolicy, PutResourcePolicy, and DeleteResourcePolicy. Added BackupArn to the output of the DescribeBackups API. Added support for BackupArn in the CreateCluster API."
+    },
+    {
+        "type": "enhancement",
+        "category": "PI",
+        "description": "Noting that the filter db.sql.db_id isn't available for RDS for SQL Server DB instances."
+    },
+    {
+        "type": "api-change",
+        "category": "WorkSpaces",
+        "description": "Added support for Red Hat Enterprise Linux 8 on Amazon WorkSpaces Personal."
+    },
+    {
+        "type": "api-change",
+        "category": "OpenSearchService",
+        "description": "This release removes support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains."
+    },
+    {
+        "type": "api-change",
+        "category": "ACMPCA",
+        "description": "Added CCPC_LEVEL_1_OR_HIGHER KeyStorageSecurityStandard and SM2 KeyAlgorithm and SM3WITHSM2 SigningAlgorithm for China regions."
+    },
+    {
+        "type": "api-change",
+        "category": "EMR",
+        "description": "This release provides the support for new allocation strategies i.e. CAPACITY_OPTIMIZED_PRIORITIZED for Spot and PRIORITIZED for On-Demand by taking input of priority value for each instance type for instance fleet clusters."
+    },
+    {
+        "type": "api-change",
+        "category": "KinesisAnalyticsV2",
+        "description": "Support for Flink 1.19 in Managed Service for Apache Flink"
+    },
+    {
+        "type": "api-change",
+        "category": "Connect",
+        "description": "This release supports showing PreferredAgentRouting step via DescribeContact API."
+    }
+]

.changes/3.315.3

@@ -0,0 +1,52 @@
+[
+    {
+        "type": "api-change",
+        "category": "PaymentCryptographyData",
+        "description": "Adding support for dynamic keys for encrypt, decrypt, re-encrypt and translate pin functions. With this change, customers can use one-time TR-31 keys directly in dataplane operations without the need to first import them into the service."
+    },
+    {
+        "type": "api-change",
+        "category": "DocDB",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    },
+    {
+        "type": "api-change",
+        "category": "PaymentCryptography",
+        "description": "Added further restrictions on logging of potentially sensitive inputs and outputs."
+    },
+    {
+        "type": "enhancement",
+        "category": "WAFV2",
+        "description": "JSON body inspection: Update documentation to clarify that JSON parsing doesn't include full validation."
+    },
+    {
+        "type": "api-change",
+        "category": "APIGateway",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    },
+    {
+        "type": "api-change",
+        "category": "CognitoIdentity",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    },
+    {
+        "type": "api-change",
+        "category": "Connect",
+        "description": "Authentication profiles are Amazon Connect resources (in gated preview) that allow you to configure authentication settings for users in your contact center. This release adds support for new ListAuthenticationProfiles, DescribeAuthenticationProfile and UpdateAuthenticationProfile APIs."
+    },
+    {
+        "type": "api-change",
+        "category": "EKS",
+        "description": "Updates EKS managed node groups to support EC2 Capacity Blocks for ML"
+    },
+    {
+        "type": "api-change",
+        "category": "SWF",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    },
+    {
+        "type": "api-change",
+        "category": "SFN",
+        "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+    }
+]

.changes/3.315.4

@@ -0,0 +1,17 @@
+[
+    {
+        "type": "api-change",
+        "category": "S3",
+        "description": "Added response overrides to Head Object requests."
+    },
+    {
+        "type": "api-change",
+        "category": "FMS",
+        "description": "Increases Customer API's ManagedServiceData length"
+    },
+    {
+        "type": "api-change",
+        "category": "EC2",
+        "description": "Documentation updates for Elastic Compute Cloud (EC2)."
+    }
+]

.changes/3.315.5

@@ -0,0 +1,27 @@
+[
+    {
+        "type": "api-change",
+        "category": "WorkSpaces",
+        "description": "Fix create workspace bundle RootStorage\/UserStorage to accept non null values"
+    },
+    {
+        "type": "enhancement",
+        "category": "DirectConnect",
+        "description": "This update includes documentation for support of new native 400 GBps ports for Direct Connect."
+    },
+    {
+        "type": "api-change",
+        "category": "Rekognition",
+        "description": "This release adds support for tagging projects and datasets with the CreateProject and CreateDataset APIs."
+    },
+    {
+        "type": "api-change",
+        "category": "Organizations",
+        "description": "Added a new reason under ConstraintViolationException in RegisterDelegatedAdministrator API to prevent registering suspended accounts as delegated administrator of a service."
+    },
+    {
+        "type": "enhancement",
+        "category": "ApplicationAutoScaling",
+        "description": "Doc only update for Application Auto Scaling that fixes resource name."
+    }
+]

.changes/3.315.6

@@ -0,0 +1,22 @@
+[
+    {
+        "type": "api-change",
+        "category": "ECR",
+        "description": "This release for Amazon ECR makes change to bring the SDK into sync with the API."
+    },
+    {
+        "type": "api-change",
+        "category": "PaymentCryptographyData",
+        "description": "Added further restrictions on logging of potentially sensitive inputs and outputs."
+    },
+    {
+        "type": "api-change",
+        "category": "QBusiness",
+        "description": "Add personalization to Q Applications. Customers can enable or disable personalization when creating or updating a Q application with the personalization configuration."
+    },
+    {
+        "type": "enhancement",
+        "category": "ACM",
+        "description": "Documentation updates, including fixes for xml formatting, broken links, and ListCertificates description."
+    }
+]