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

chore: patch enterprise back to core #25798

Merged
merged 1 commit into from
Jan 11, 2025
Merged

Conversation

hiltontj
Copy link
Contributor

This PR patches changes from enterprise back into core so they are as in-sync as possible, and to pull back changes that have been made to core code in the enterprise repo.

Copy link
Member

@pauldix pauldix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one question, don't think we should be allowing any BSL licensed stuff so not sure what this is doing in the allow list.

deny.toml Outdated
allow = [
"Apache-2.0",
"BSD-2-Clause",
"BSD-3-Clause",
"BSD-4-Clause",
"BSL-1.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't actually needed so I will remove it.

@hiltontj hiltontj force-pushed the hiltontj/enterprise-core-patch branch from dd798a8 to 0d9b2c4 Compare January 11, 2025 21:54
@hiltontj hiltontj merged commit 0bdc2fa into main Jan 11, 2025
13 checks passed
@hiltontj hiltontj deleted the hiltontj/enterprise-core-patch branch January 11, 2025 22:26
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.

2 participants