hadoop git commit: HADOOP-9242. Duplicate surefire plugin config in hadoop-common. Contributed by Andrey Klochkov.

2015-10-30 Thread sjlee 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 eedbd033d -> 22095d7a7


HADOOP-9242. Duplicate surefire plugin config in hadoop-common. Contributed by 
Andrey Klochkov.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1438213 
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 16acd69e587956105897ccff2d4dd4b473aaf8bc)


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

Branch: refs/heads/branch-2.6
Commit: 22095d7a72e8fe52950589ebb58893762bc30ea4
Parents: eedbd03
Author: Suresh Srinivas 
Authored: Thu Jan 24 21:51:34 2013 +
Committer: Sangjin Lee 
Committed: Fri Oct 30 14:38:51 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +++
 hadoop-common-project/hadoop-common/pom.xml | 18 ++
 2 files changed, 9 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/22095d7a/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index ea39ebb..ae27e38 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -15,6 +15,9 @@ Release 2.6.3 - UNRELEASED
 HADOOP-12230. hadoop-project declares duplicate, conflicting curator
 dependencies. (Rakesh R via aajisaka)
 
+HADOOP-9242. Duplicate surefire plugin config in hadoop-common.
+(Andrey Klochkov via suresh)
+
 Release 2.6.2 - 2015-10-21
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/22095d7a/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 0beb11a..529d399 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -408,6 +408,12 @@
 ${kdc.resource.dir}
 ${runningWithNative}
   
+  
+
+  listener
+  org.apache.hadoop.test.TimedOutTestsListener
+
+  
 
   
   
@@ -513,18 +519,6 @@
   
 
   
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-
-  
-
-  listener
-  org.apache.hadoop.test.TimedOutTestsListener
-
-  
-
-

hadoop git commit: HADOOP-9242. Duplicate surefire plugin config in hadoop-common. Contributed by Andrey Klochkov.

2015-10-30 Thread sjlee 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 dae9f0ef5 -> b8d586fd8


HADOOP-9242. Duplicate surefire plugin config in hadoop-common. Contributed by 
Andrey Klochkov.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1438213 
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 16acd69e587956105897ccff2d4dd4b473aaf8bc)


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

Branch: refs/heads/branch-2
Commit: b8d586fd8a507fd93fd5d927c848cc62f5ee4752
Parents: dae9f0e
Author: Suresh Srinivas 
Authored: Thu Jan 24 21:51:34 2013 +
Committer: Sangjin Lee 
Committed: Fri Oct 30 14:27:45 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +++
 hadoop-common-project/hadoop-common/pom.xml | 18 ++
 2 files changed, 9 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8d586fd/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 88ba535..21e5fbf 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -696,6 +696,9 @@ Release 2.8.0 - UNRELEASED
 HADOOP-12519. hadoop-azure tests should avoid creating a metrics
 configuration file in the module root directory. (cnauroth)
 
+HADOOP-9242. Duplicate surefire plugin config in hadoop-common.
+(Andrey Klochkov via suresh)
+
   OPTIMIZATIONS
 
 HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8d586fd/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 22d66cf..ccbe0d6 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -403,6 +403,12 @@
 ${kdc.resource.dir}
 ${runningWithNative}
   
+  
+
+  listener
+  org.apache.hadoop.test.TimedOutTestsListener
+
+  
 
   
   
@@ -492,18 +498,6 @@
   
 
   
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-
-  
-
-  listener
-  org.apache.hadoop.test.TimedOutTestsListener
-
-  
-
-

hadoop git commit: HADOOP-9242. Duplicate surefire plugin config in hadoop-common. Contributed by Andrey Klochkov.

2015-10-30 Thread sjlee 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 63cd0c8ba -> a4fd068d4


HADOOP-9242. Duplicate surefire plugin config in hadoop-common. Contributed by 
Andrey Klochkov.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1438213 
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 16acd69e587956105897ccff2d4dd4b473aaf8bc)


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

Branch: refs/heads/branch-2.7
Commit: a4fd068d46cfb2c4101f361dfa035d6252cbf5a4
Parents: 63cd0c8
Author: Suresh Srinivas 
Authored: Thu Jan 24 21:51:34 2013 +
Committer: Sangjin Lee 
Committed: Fri Oct 30 14:32:38 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +++
 hadoop-common-project/hadoop-common/pom.xml | 18 ++
 2 files changed, 9 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4fd068d/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 3d2bf34..ee9e771 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -51,6 +51,9 @@ Release 2.7.2 - UNRELEASED
 
 HADOOP-12464. Interrupted client may try to fail-over and retry (kihwal)
 
+HADOOP-9242. Duplicate surefire plugin config in hadoop-common.
+(Andrey Klochkov via suresh)
+
 Release 2.7.1 - 2015-07-06 
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4fd068d/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 cdb2c9f..6446020 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -398,6 +398,12 @@
 ${kdc.resource.dir}
 ${runningWithNative}
   
+  
+
+  listener
+  org.apache.hadoop.test.TimedOutTestsListener
+
+  
 
   
   
@@ -503,18 +509,6 @@
   
 
   
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-
-  
-
-  listener
-  org.apache.hadoop.test.TimedOutTestsListener
-
-  
-
-