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

Add upstream changes #34

Merged
merged 10 commits into from
Jul 17, 2024
Merged

Add upstream changes #34

merged 10 commits into from
Jul 17, 2024

Conversation

mgoetzegb
Copy link
Member

What

Add upstream changes

Why

We want the most recent state.

koplas and others added 10 commits June 12, 2024 10:11
* docs: fix licensing info for generated files

 * change generate_cvss_enums.go to note that the input file is
   relevant for the license.
 * change license and copyright of cvss20enums.go and cvss3enums.go
   to BSD-3-Clause and FIRST.
 * add reuse.software 3.0 compatible files for the schema cvss files.

* Stamp right license into generated files.

---------

Co-authored-by: Sascha L. Teichmann <[email protected]>
previously in case case of trying last resort dns, all other error messages were dropped
Copy link

Conventional Commits Report

Type Number
Bug Fixes 2

🚀 Conventional commits found.

@mgoetzegb mgoetzegb mentioned this pull request Jul 16, 2024
1 task
@mgoetzegb mgoetzegb marked this pull request as ready for review July 16, 2024 09:52
@mgoetzegb mgoetzegb requested a review from a team as a code owner July 16, 2024 09:52
@mgoetzegb
Copy link
Member Author

mgoetzegb commented Jul 16, 2024

Resolved conflict, otherwise these are simply the upstream changes.

@mgoetzegb mgoetzegb merged commit 81fbcd7 into main-gb Jul 17, 2024
5 of 6 checks passed
@mgoetzegb mgoetzegb deleted the add-upstream-changes branch July 17, 2024 13:58
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.

6 participants