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.

Sign up for GitHub

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

Jump to bottom

Clarify that license terms are "or" not "and" #181

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Clarify that license terms are "or" not "and" #181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38bd798
Clarify that license terms are "or" not "and"
jamietanna Jan 22, 2024
800904c
Merge branch 'main' into patch-1
mmat11 Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
The https://github.com/elastic/ebpf repository contains source code under
various licenses:

- Source code in the 'GPL' directory, is dual-licensed under the GNU General
Public License version 2 (licenses/GPL-LICENSE.txt) and BSD 2-Clause license
(licenses/BSD-2-CLAUSE-LICENSE.txt)
- Source code in the 'GPL' directory, is dual-licensed under the terms of your
choice: either the GNU General Public License version 2 (licenses/GPL-LICENSE.txt)
or BSD 2-Clause license (licenses/BSD-2-CLAUSE-LICENSE.txt).

- Source code in the 'non-GPL' and 'testing' directories is licensed under the
Elastic License 2.0 (licenses/ELASTIC-LICENSE-2.0.txt).
Expand Down
Loading