Skip to content

Conversation

@dpilch
Copy link
Contributor

@dpilch dpilch commented Oct 23, 2024

Description of changes

Conflicts:

	both modified:   codebuild_specs/e2e_workflow.yml
	both modified:   packages/amplify-graphql-api-construct/.jsii

Regenerated files to resolve conflicts.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Dane Pilcher added 24 commits July 12, 2024 16:03
* refactor: combine indexName assignment branches

* refactor: explicitly assign undefined in falsy condition for table validation

* docs: remove unnecessary comment
* test: add some migration validation tests

* test: override migration e2es to use ddb managed encryption

* chore: split e2e tests

* test: temp for testing

* Revert "test: temp for testing"

This reverts commit 84ff77b.
@dpilch dpilch requested review from a team as code owners October 23, 2024 16:36
@dpilch dpilch merged commit 2f303b4 into main Oct 23, 2024
6 of 7 checks passed
@dpilch dpilch deleted the merge-main-to-migration branch October 23, 2024 16:50
dpilch pushed a commit that referenced this pull request Oct 23, 2024
…tion"

This reverts commit 2f303b4, reversing
changes made to 8da7802.
dpilch pushed a commit that referenced this pull request Oct 23, 2024
Revert "Merge pull request #2976 from aws-amplify/merge-main-to-migra…
tejas2008 pushed a commit that referenced this pull request Oct 29, 2024
…tion"

This reverts commit 2f303b4, reversing
changes made to 8da7802.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants