Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Merge Conflicts after v3 -> v4 merge in petesong/stj branch #3605

Merged
merged 1 commit into from
Jan 14, 2025

Conversation

peterrsongg
Copy link
Contributor

Description

This change is just the code changes required to fix merge conflicts after rebasing petesong/stj on v4-development. The main things were the IsDateTime turning into IsTimeStamp, then the changes to s3 exception unmarshalling, and the removal of Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds in the generator.

Motivation and Context

Testing

Screenshots (if appropriate)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • My code follows the code style of this project
  • My change requires a change to the documentation
  • I have updated the documentation accordingly
  • I have read the README document
  • I have added tests to cover my changes
  • All new and existing tests passed

License

  • I confirm that this pull request can be released under the Apache 2 license

@peterrsongg peterrsongg added the v4 label Jan 13, 2025
@peterrsongg peterrsongg merged commit 277a6f5 into petesong/stj Jan 14, 2025
1 check passed
@peterrsongg peterrsongg deleted the petesong/stj-dryrun branch January 14, 2025 20:05
peterrsongg added a commit that referenced this pull request Jan 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants