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 xg...@apache.org on 2016/12/09 22:25:51 UTC

[14/50] [abbrv] hadoop git commit: HADOOP-13835. Move Google Test Framework code from mapreduce to hadoop-common. Contributed by Varun Vasudev.

HADOOP-13835. Move Google Test Framework code from mapreduce to hadoop-common. Contributed by Varun Vasudev.


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

Branch: refs/heads/YARN-5734
Commit: b2a3d6c519d83283a49b0d2172dcf1de97f9c4bc
Parents: 8e63fa9
Author: Akira Ajisaka <aa...@apache.org>
Authored: Tue Dec 6 14:01:47 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Tue Dec 6 14:01:47 2016 +0900

----------------------------------------------------------------------
 LICENSE.txt                                     |     2 +-
 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 +++++++++++++++++
 .../hadoop-mapreduce-client-nativetask/pom.xml  |     2 -
 .../src/CMakeLists.txt                          |     8 +-
 .../src/main/native/gtest/gtest-all.cc          | 10403 --------
 .../src/main/native/gtest/include/gtest/gtest.h | 21192 -----------------
 8 files changed, 31603 insertions(+), 31600 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2a3d6c5/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 04d2daa..2183f0e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -289,7 +289,7 @@ For src/main/native/src/org/apache/hadoop/io/compress/lz4/{lz4.h,lz4.c,lz4hc.h,l
 */
 
 
-For hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/gtest
+For hadoop-common-project/hadoop-common/src/main/native/gtest
 ---------------------------------------------------------------------
 Copyright 2008, Google Inc.
 All rights reserved.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2a3d6c5/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 1d45452..c9b282f 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -523,6 +523,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