Merge branch 'master' #4054
Merged
Merge branch 'master' #4054
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…fbe632eab Pull request: release <- staging/409e31da-8c20-48f6-abfd-353fbe632eab
Only support UseArnRegion and ForcePathStyle as they're the only ones we can support with the CRT client.
This ensures that flattened fields are correctly resolved for conversion. This mostly impacts extensions such as the AutoGeneratedTimestampRecordExtension which could not handle a flattend timestamp field. #3150 Co-authored-by: Andy Kiesler <[email protected]>
* docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
…s a new parameter 'DBClusterParameterGroupName' to 'RestoreDBClusterFromSnapshot' API to associate the name of the DB cluster parameter group while performing restore.
…tions as needed in support of temporary credentials with IAM identity.
…tream API to support streaming Lambda function responses. The release also adds a new InvokeMode parameter to Function Url APIs to control whether the response will be streamed or buffered.
…tLifecyclePolicy API
… condition to tag-based RLS rules in CreateDataSet and UpdateDataSet; adding RefreshSchedule and Incremental RefreshProperties operations for users to programmatically configure SPICE dataset ingestions.
…epository associations on Persistent_1 and Scratch_2 file systems.
…6477d943c Pull request: release <- staging/92894462-201e-435a-8445-9356477d943c
… Interface (#3885) * Expose StandardRetryOptions in the S3CrtClient Interface * Added wrapper class for CRT retry config * Added Null checks and test cases * Handled PR comment on javadoc * Handled NIT comments
…gure an agent's routing profile to receive contacts from multiple channels at the same time via extending the UpdateRoutingProfileConcurrency, CreateRoutingProfile and DescribeRoutingProfile APIs.
…abling FIPS compliance on Amazon ECS Fargate tasks
…rt resource sharing: GetResourcePolicy, PutResourcePolicy, and DeleteResourcePolicy. Added new OwnershipType field to ListEntities request to let users filter on entities that are shared with them. Increased max page size of ListEntities response from 20 to 50 results.
…s APIs in Amazon Rekognition. Updates UpdateStreamProcessor to return ResourceInUseException Exception. Minor updates to API documentation.
… supports conversion of 608 paint-on captions to pop-on captions for SCC sources.
…155f82bbe Pull request: release <- staging/65fa4d38-9143-4102-9b51-9c7155f82bbe
… SQL arguments on RedshiftDataParameters
…3b747bee3 Pull request: release <- staging/50c63bca-e684-4b68-834c-7563b747bee3
…ovider for WebIdentityTokenFileCredentialProvider (#3899) Enable async credential update for WebIdentityTokenFileCredentialProvider
…code to support 3 Tagging related APIs
…etAssetPropertyValueHistory/BatchGetAssetPropertyValueHistory and 15 minute aggregate resolution for GetAssetPropertyAggregates/BatchGetAssetPropertyAggregates
…rity Token Service.
…ee30e6824 Pull request: release <- staging/edf479cc-a010-4e53-a02a-779ee30e6824
…) Provisioned Concurrency for Amazon SageMaker Serverless Inference and (2) UpdateEndpointWeightsAndCapacities API for Serverless endpoints.
…Serverless Inference customers can use Application Auto Scaling to auto scale the provisioned concurrency of their serverless endpoints.
…odes in addition to DynamicTransform OutputSchemas
…5c9001162 Pull request: release <- staging/202cbe00-20fa-4509-8086-1ad5c9001162
* Use mock HTTP clients in timeout tests * Fix checkstyle errors * Use JUnit5 and address other feedback
|
SonarCloud Quality Gate failed.
|
|
note, I ran However, I realized that when I did |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
The previous merge in #3910 was merged using
Squash and mergeon the UI, instead of pushing from command line, causing new merge attempts to have lots of conflicts.Modifications
To fix that, reverting the previous merge's squashed commit 005b39b and redoing the merge. There were a few minor conflicts (around import statements) to resolve (in the revert and the merge) and added another commit to update the pom.xml for the new modules in the feature/master/sra-identity-auth branch to the one from master (2.20.62-SNAPSHOT).
FYI, just the revert
git revert 005b39b4deb2825b0e9639c31ba677d5db66797dwas attempted in #4051, which builds fine. Beyond that in this PR, I didgit merge masterHere's the
git logof my local branch (gosar/sra-ia-merge) used for this PR.