-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into pr/jportner/80945
- Loading branch information
Showing
8,043 changed files
with
46,109 additions
and
128,456 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,7 @@ | ||
Source code in this repository is variously licensed under the Apache License | ||
Version 2.0, an Apache compatible license, or the Elastic License. Outside of | ||
the "x-pack" folder, source code in a given file is licensed under the Apache | ||
License Version 2.0, unless otherwise noted at the beginning of the file or a | ||
LICENSE file present in the directory subtree declares a separate license. | ||
Within the "x-pack" folder, source code in a given file is licensed under the | ||
Elastic License, unless otherwise noted at the beginning of the file or a | ||
LICENSE file present in the directory subtree declares a separate license. | ||
|
||
The build produces two sets of binaries - one set that falls under the Elastic | ||
License and another set that falls under Apache License Version 2.0. The | ||
binaries that contain `-oss` in the artifact name are licensed under the Apache | ||
License Version 2.0. | ||
Source code in this repository is covered by (i) a dual license under the Server | ||
Side Public License, v 1 and the Elastic License or (ii) an Apache License 2.0 | ||
compatible license or (iii) solely under the Elastic License, in each case, as | ||
noted in the applicable header. The default throughout the repository is a dual | ||
license under the Server Side Public License, v 1 and the Elastic License, | ||
unless the header specifies another license. Code that is licensed solely under | ||
the Elastic License is found only in the x-pack folder. |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.