Fix Merge Conflicts after v3 -> v4 merge in petesong/stj branch #3605
+74
−359
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.
Description
This change is just the code changes required to fix merge conflicts after rebasing
petesong/stj
on v4-development. The main things were theIsDateTime
turning intoIsTimeStamp
, then the changes to s3 exception unmarshalling, and the removal ofAmazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds
in the generator.Motivation and Context
Testing
Screenshots (if appropriate)
Types of changes
Checklist
License