Skip to content

Commit 69e70f4

Browse files
author
Camden Cheek
authored
Merge pull request #15 from newrelic/license
Update license and readme wth legal-approved versions
2 parents bb0bf95 + 77f4324 commit 69e70f4

File tree

2 files changed

+35
-8
lines changed

2 files changed

+35
-8
lines changed

LICENSE

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,36 @@
1-
Copyright 2018, Blue Medora Inc.
1+
HashiCorp components. The on host integration contains the following open source software (in unmodified form) provided by HashiCorp, distributed under the Mozilla Public License 2.0. The source code of these components is freely available at the links below. Copyright HashiCorp.
2+
3+
consul
4+
Source code available at: https://github.com/hashicorp/consul
5+
License: https://github.com/hashicorp/consul/blob/master/LICENSE
6+
7+
go-cleanhttp
8+
Source code available at: https://github.com/hashicorp/go-cleanhttp
9+
License: https://github.com/hashicorp/go-cleanhttp/blob/master/LICENSE
10+
11+
go-immutable-radix
12+
Source code available at: https://github.com/hashicorp/go-immutable-radix
13+
License: https://github.com/hashicorp/go-immutable-radix/blob/master/LICENSE
14+
15+
go-rootcerts
16+
Source code available at: https://github.com/hashicorp/go-rootcerts
17+
License: https://github.com/hashicorp/go-rootcerts/blob/master/LICENSE
18+
19+
golang-lru
20+
Source code available at: https://github.com/hashicorp/golang-lru
21+
License: https://github.com/hashicorp/golang-lru/blob/master/LICENSE
22+
23+
serf
24+
Source code available at: https://github.com/hashicorp/serf
25+
License: https://github.com/hashicorp/serf/blob/master/LICENSE
226

27+
All other components of this on host integration are Copyright 2019, Blue Medora Inc.
328

4-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in
5-
the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
6-
Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
29+
30+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
731

832
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
933

10-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
11-
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
12-
OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
13-
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
34+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35+
36+

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ The New Relic Infrastructure Integration for HashiCorp Consul captures critical
44

55
All data is obtained via the REST API.
66

7+
*HashiCorp components* The on host integration contains open source software (in unmodified form) provided by HashiCorp, distributed under the Mozilla Public License 2.0 (https://www.mozilla.org/en-US/MPL/2.0/FAQ/.). Please see [LICENSE](LICENSE) for additional information. Do not remove the license file. Mozilla Public License 2.0 is a copyleft light open source license, if you do not want to be subject the copyleft light open source provisions, do not modify the MPL 2.0 files.
8+
9+
All other components of this on host integration are licensed under an MIT license, Copyright 2019, Blue Medora Inc. Please see [LICENSE](LICENSE) for additional information.
10+
711
## Requirements
812

913
No requirements at this time.

0 commit comments

Comments
 (0)