parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject parquet-cpp git commit: PARQUET-784: Reference Spark, Kudu and FrameOfReference in LICENSE
Date Sun, 04 Dec 2016 15:53:12 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master 8bff44273 -> 90cd8e33c


PARQUET-784: Reference Spark, Kudu and FrameOfReference in LICENSE

Author: Korn, Uwe <Uwe.Korn@blue-yonder.com>

Closes #197 from xhochy/PARQUET-784 and squashes the following commits:

b0c78c0 [Korn, Uwe] PARQUET-784: Reference Spark, Kudu and FrameOfReference in LICENSE


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/90cd8e33
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/90cd8e33
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/90cd8e33

Branch: refs/heads/master
Commit: 90cd8e33cc55fdb09297e3162b4b89ee8bdd3ed0
Parents: 8bff442
Author: Korn, Uwe <Uwe.Korn@blue-yonder.com>
Authored: Sun Dec 4 10:53:04 2016 -0500
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Sun Dec 4 10:53:04 2016 -0500

----------------------------------------------------------------------
 LICENSE.txt | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/90cd8e33/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index d645695..8f03674 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -200,3 +200,36 @@
    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.
+
+--------------------------------------------------------------------------------
+
+This product includes code from Apache Spark.
+
+* dev/merge_parquet_pr.py is based on Spark's dev/merge_spark_pr.py
+
+Copyright: 2014 The Apache Software Foundation.
+Home page: https://spark.apache.org/
+License: http://www.apache.org/licenses/LICENSE-2.0
+
+--------------------------------------------------------------------------------
+
+This project includes code from Daniel Lemire's FrameOfReference project.
+
+https://github.com/lemire/FrameOfReference/blob/6ccaf9e97160f9a3b299e23a8ef739e711ef0c71/src/bpacking.cpp
+
+Copyright: 2013 Daniel Lemire
+Home page: http://lemire.me/en/
+Project page: https://github.com/lemire/FrameOfReference
+License: Apache License Version 2.0 http://www.apache.org/licenses/LICENSE-2.0
+
+--------------------------------------------------------------------------------
+
+This product includes code from Apache Kudu.
+
+ * cmake_modules/CompilerInfo.cmake is based on Kudu's cmake_modules/CompilerInfo.cmake
+
+Copyright: 2016 The Apache Software Foundation.
+Home page: https://kudu.apache.org/
+License: http://www.apache.org/licenses/LICENSE-2.0
+
+--------------------------------------------------------------------------------


Mime
View raw message