Skip to content

Commit

Permalink
Merge branch 'main' into aws-cn-support
Browse files Browse the repository at this point in the history
# Conflicts:
#	API.md
#	src/account.ts
#	src/delegated-administrator.ts
#	test/__snapshots__/account.test.ts.snap
#	test/__snapshots__/delegated-administrator.test.ts.snap
#	test/__snapshots__/dependency-chain.test.ts.snap
#	test/__snapshots__/enable-policy-type.test.ts.snap
#	test/__snapshots__/integ.default.test.ts.snap
#	test/__snapshots__/organization.test.ts.snap
#	test/__snapshots__/organizational-unit.test.ts.snap
#	test/__snapshots__/policy-attachment.test.ts.snap
#	test/__snapshots__/policy.test.ts.snap
#	test/__snapshots__/tag-resource.test.ts.snap
  • Loading branch information
pflorek committed Dec 18, 2024
2 parents 9f91222 + a4de737 commit 97232d5
Show file tree
Hide file tree
Showing 50 changed files with 2,539 additions and 3,118 deletions.
2 changes: 1 addition & 1 deletion .editorconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 6 additions & 13 deletions .eslintrc.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/dependabot.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/auto-approve.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

155 changes: 99 additions & 56 deletions .github/workflows/build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions .github/workflows/pull-request-lint.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 97232d5

Please sign in to comment.