Skip to content

Commit 1f04c7f

Browse files
slimm609lynn-e
authored andcommitted
fix: update license and remove from README (vmware#382)
- remove license block from readme - update license file - remove header.txt Signed-off-by: Brian Davis <[email protected]>
1 parent 09c2280 commit 1f04c7f

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

LICENSE

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
kube-fluentd-operator
22

3-
Copyright 2022 VMware, Inc. All rights reserved
4-
5-
The BSD-2 license (the ìLicenseî) set forth below applies to all parts of the kube-fluentd-operator
6-
project. You may not use this file except in compliance with the License.†
7-
8-
BSD-2 License
3+
Copyright 2023 VMware, Inc. All rights reserved
94

105
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
11-
ï Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
12-
ï Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
13-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
146

7+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
158

9+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
1610

11+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ It gets processed into the following configuration which is then fed to Fluentd:
178178
</match>
179179

180180
<filter kube.monitoring.*.*.**>
181-
@type record_transformer
181+
@type record_modifier
182182
remove_keys kubernetes_pod_label_values
183183
</filter>
184184

@@ -1193,13 +1193,3 @@ The kube-fluentd-operator project team welcomes contributions from the community
11931193
signed our contributor license agreement (CLA), our bot will update the issue when you open a Pull Request. For any
11941194
questions about the CLA process, please refer to our [FAQ](https://cla.vmware.com/faq). For more detailed information,
11951195
refer to [CONTRIBUTING.md](CONTRIBUTING.md).
1196-
1197-
## License
1198-
1199-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1200-
1201-
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
1202-
1203-
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
1204-
1205-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

header.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)