You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2017/10/06 00:03:43 UTC
[3/3] hadoop git commit: HADOOP-13835. Move Google Test Framework
code from mapreduce to hadoop-common. (Varun Vasudev via wangda)
HADOOP-13835. Move Google Test Framework code from mapreduce to hadoop-common. (Varun Vasudev via wangda)
Change-Id: I1031a4fa4e0c5c76928d03c5e61971978ec7e6ab
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/73d1b02d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/73d1b02d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/73d1b02d
Branch: refs/heads/branch-2
Commit: 73d1b02d5a92598aa170acb3dbc06c72a5384f96
Parents: cb91bb3
Author: Wangda Tan <wa...@apache.org>
Authored: Thu Oct 5 17:02:00 2017 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Thu Oct 5 17:02:00 2017 -0700
----------------------------------------------------------------------
LICENSE.txt | 32 +
hadoop-common-project/hadoop-common/pom.xml | 1 +
.../src/main/native/gtest/gtest-all.cc | 10403 ++++++++
.../src/main/native/gtest/include/gtest/gtest.h | 21192 +++++++++++++++++
4 files changed, 31628 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/73d1b02d/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 52642b0..ff818ba 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -325,6 +325,38 @@ For src/main/native/src/org/apache/hadoop/io/compress/lz4/{lz4.h,lz4.c,lz4hc.h,l
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/
+
+For hadoop-common-project/hadoop-common/src/main/native/gtest
+---------------------------------------------------------------------
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * 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.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+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
+OWNER 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.
+
For hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/fuse-dfs/util/tree.h
---------------------------------------------------------------------
Copyright 2002 Niels Provos <pr...@citi.umich.edu>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/73d1b02d/hadoop-common-project/hadoop-common/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 6b4ace5..dec1db0 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -509,6 +509,7 @@
<exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.h</exclude>
<exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.c</exclude>
<exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc_encoder.h</exclude>
+ <exclude>src/main/native/gtest/**/*</exclude>
<exclude>src/test/resources/test-untar.tgz</exclude>
<exclude>src/test/resources/test.har/_SUCCESS</exclude>
<exclude>src/test/resources/test.har/_index</exclude>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org