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-900: Fix NOTICE / LICENSE issues
Date Fri, 03 Mar 2017 14:31:32 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master 6d76a5584 -> d9f693ddf


PARQUET-900: Fix NOTICE / LICENSE issues

@rdblue Can you check that this resolves all issues from the RC3?

Author: Uwe L. Korn <uwe@apache.org>

Closes #263 from xhochy/PARQUET-900 and squashes the following commits:

c9e2df1 [Uwe L. Korn] PARQUET-900: Fix NOTICE / LICENSE issues


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

Branch: refs/heads/master
Commit: d9f693ddf34bc1621cababef6defeeea7c0b7988
Parents: 6d76a55
Author: Uwe L. Korn <uwe@apache.org>
Authored: Fri Mar 3 09:31:24 2017 -0500
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Fri Mar 3 09:31:24 2017 -0500

----------------------------------------------------------------------
 .travis.yml | 16 ++++++++++++++++
 LICENSE.txt |  8 ++++++++
 NOTICE.txt  |  4 ----
 3 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/d9f693dd/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 52f0f03..fffe8b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
 sudo: required
 dist: trusty
 addons:

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/d9f693dd/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 5e63e2b..d1d1b70 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -255,3 +255,11 @@ Home page: https://aurora.apache.org/
 License: http://www.apache.org/licenses/LICENSE-2.0
 
 --------------------------------------------------------------------------------
+
+This product includes code from the Google styleguide.
+
+* build-support/cpplint.py is based on the scripts from the Google styleguide.
+
+Copyright: 2009 Google Inc. All rights reserved.
+Homepage: https://github.com/google/styleguide
+License: 3-clause BSD

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/d9f693dd/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index fbcb9a1..a1ab98e 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -3,7 +3,3 @@ Copyright 2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software from FrameOfReference (Apache 2.0)
-  https://github.com/lemire/FrameOfReference/blob/6ccaf9e97160f9a3b299e23a8ef739e711ef0c71/src/bpacking.cpp
-  * (c) Daniel Lemire 2013


Mime
View raw message