You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2019/09/19 23:20:38 UTC
[incubator-datasketches-java] branch master updated: Update LICENSE
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git
The following commit(s) were added to refs/heads/master by this push:
new 0355a15 Update LICENSE
0355a15 is described below
commit 0355a15a3f9ea59509bf8aa1ba1ddd2eacb36328
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Thu Sep 19 16:20:30 2019 -0700
Update LICENSE
---
LICENSE | 30 ++++--------------------------
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/LICENSE b/LICENSE
index 10e39dd..7c089a2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -212,30 +212,9 @@ APPENDIX B: Additional licenses relevant to Apache DataSketches-java (INCUBATING
BSD-2-Clause License
================================
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 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.
-
- 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.
+ https://github.com/Cyan4973/xxHash/blob/dev/LICENSE
- Code locations subject to the above license:
+ Code locations subject to the BSD-2-Clause License:
-------------------------------------------------------------
This product contains code to implement the xxHash function:
* https://github.com/apache/incubator-datasketches-java/blob/master/src/main/java/org/apache/datasketches/hash/XxHash.java
@@ -243,9 +222,8 @@ APPENDIX B: Additional licenses relevant to Apache DataSketches-java (INCUBATING
and adapted from C++ source code located at:
* https://github.com/Cyan4973/xxHash/blob/dev/xxhash.c
* https://github.com/Cyan4973/xxHash/blob/dev/xxhash.h
- Copyright (C) 2012-2016, Yann Collet.
-
-
+
+
Public Domain (optional)
================================
This product contains code to implement and test Austin Appleby's C++ public domain implementation of the
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org