You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by we...@apache.org on 2016/12/05 14:49:48 UTC

parquet-cpp git commit: PARQUET-788: Add Apache Impala (incubating) to LICENSE.txt

Repository: parquet-cpp
Updated Branches:
  refs/heads/master 90cd8e33c -> 51408aeea


PARQUET-788: Add Apache Impala (incubating) to LICENSE.txt

Author: Wes McKinney <we...@twosigma.com>

Closes #200 from wesm/PARQUET-788 and squashes the following commits:

7cf5e39 [Wes McKinney] Add Apache Impala (incubating) to LICENSE.txt


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

Branch: refs/heads/master
Commit: 51408aeeac85c81b900842743c6c8b39296014fb
Parents: 90cd8e3
Author: Wes McKinney <we...@twosigma.com>
Authored: Mon Dec 5 09:49:41 2016 -0500
Committer: Wes McKinney <we...@twosigma.com>
Committed: Mon Dec 5 09:49:41 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/51408aee/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 8f03674..1bf56ab 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -233,3 +233,14 @@ Home page: https://kudu.apache.org/
 License: http://www.apache.org/licenses/LICENSE-2.0
 
 --------------------------------------------------------------------------------
+
+This product includes code from Apache Impala (incubating), formerly
+Impala. The Impala code and rights were donated to the ASF as part of the
+Incubator process after the initial code imports into Apache Parquet.
+
+Copyright: 2012 Cloudera, Inc.
+Copyright: 2016 The Apache Software Foundation.
+Home page: http://impala.apache.org/
+License: http://www.apache.org/licenses/LICENSE-2.0
+
+--------------------------------------------------------------------------------