This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch UpdateLicenseFiles in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-postgresql.git
commit 43d4d5cb1baf41dffec71fbd3d61e8f8d7e5be78 Author: Lee Rhodes <[email protected]> AuthorDate: Fri May 8 14:46:38 2020 -0700 Update License, Notice, Disclaimer-wip --- DISCLAIMER-WIP | 2 +- LICENSE | 53 +++++++++++++++++++++++++++++------------------------ NOTICE | 5 ++++- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP index 2d6aafd..ae9f942 100644 --- a/DISCLAIMER-WIP +++ b/DISCLAIMER-WIP @@ -15,7 +15,7 @@ un-reviewed licensing conditions. What follows is a list of known issues the project is currently aware of (note that this list, by definition, is likely to be incomplete): - * The LICENSE file may be incomplete and will be fixed with the next release. + * No issues are known at this time. If you are planning to incorporate this work into your product or project, please be aware that you will need to conduct a diff --git a/LICENSE b/LICENSE index d645695..6e81e25 100644 --- a/LICENSE +++ b/LICENSE @@ -176,27 +176,32 @@ END OF TERMS AND CONDITIONS - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + + +APPENDIX A: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + ------------------------------------------------------------- + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ------------------------------------------------------------- + + diff --git a/NOTICE b/NOTICE index a2de9b9..e51b4ae 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,8 @@ Apache DataSketches-postgresql (incubating) -Copyright 2019 The Apache Software Foundation +Copyright 2020 The Apache Software Foundation + +Copyright 2015-2018 Yahoo +Copyright 2019 Verizon Media This product includes software developed at The Apache Software Foundation (http://www.apache.org/). --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
