hadoop git commit: HADOOP-12415. Add io.netty dependency to hadoop-nfs and to hadoop-hdfs, needed to build Bigtop successfuly, see BIGTOP-2049

[cos]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 23c625ec5 -> b4c6b511e


HADOOP-12415. Add io.netty dependency to hadoop-nfs and to hadoop-hdfs, needed 
to build Bigtop successfuly, see BIGTOP-2049

Signed-off-by: Konstantin Boudnik 


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

Branch: refs/heads/trunk
Commit: b4c6b511e705230dfe4580288addacb81f5c5c5f
Parents: 23c625e
Author: Tom Zeng 
Authored: Mon Sep 21 09:32:25 2015 -0700
Committer: Konstantin Boudnik 
Committed: Tue Nov 24 18:36:34 2015 -0800

--
 hadoop-common-project/hadoop-nfs/pom.xml | 5 +
 hadoop-hdfs-project/hadoop-hdfs/pom.xml  | 5 +
 2 files changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4c6b511/hadoop-common-project/hadoop-nfs/pom.xml
--
diff --git a/hadoop-common-project/hadoop-nfs/pom.xml 
b/hadoop-common-project/hadoop-nfs/pom.xml
index e8156d9..16e53f3 100644
--- a/hadoop-common-project/hadoop-nfs/pom.xml
+++ b/hadoop-common-project/hadoop-nfs/pom.xml
@@ -82,6 +82,11 @@
   runtime
 
 
+  io.netty
+  netty
+  compile
+
+
   com.google.guava
   guava
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4c6b511/hadoop-hdfs-project/hadoop-hdfs/pom.xml
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml 
b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index c8a0dc6..cffc11b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -176,6 +176,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 
 
   io.netty
+  netty
+  compile
+
+
+  io.netty
   netty-all
   compile
 

hadoop git commit: HADOOP-12415. Add io.netty dependency to hadoop-nfs and to hadoop-hdfs, needed to build Bigtop successfuly, see BIGTOP-2049

[cos]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 7b9f7eaf5 -> d6f7d2292


HADOOP-12415. Add io.netty dependency to hadoop-nfs and to hadoop-hdfs, needed 
to build Bigtop successfuly, see BIGTOP-2049

Signed-off-by: Konstantin Boudnik 
(cherry picked from commit b4c6b511e705230dfe4580288addacb81f5c5c5f)


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

Branch: refs/heads/branch-2
Commit: d6f7d22929d556783fd682227d86d5bf9aba7275
Parents: 7b9f7ea
Author: Tom Zeng 
Authored: Mon Sep 21 09:32:25 2015 -0700
Committer: Konstantin Boudnik 
Committed: Tue Nov 24 18:39:01 2015 -0800

--
 hadoop-common-project/hadoop-nfs/pom.xml | 5 +
 hadoop-hdfs-project/hadoop-hdfs/pom.xml  | 5 +
 2 files changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6f7d229/hadoop-common-project/hadoop-nfs/pom.xml
--
diff --git a/hadoop-common-project/hadoop-nfs/pom.xml 
b/hadoop-common-project/hadoop-nfs/pom.xml
index f101669..932c23e 100644
--- a/hadoop-common-project/hadoop-nfs/pom.xml
+++ b/hadoop-common-project/hadoop-nfs/pom.xml
@@ -82,6 +82,11 @@
   runtime
 
 
+  io.netty
+  netty
+  compile
+
+
   com.google.guava
   guava
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6f7d229/hadoop-hdfs-project/hadoop-hdfs/pom.xml
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml 
b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 0d1856b..b4c3c7e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -175,6 +175,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 
 
   io.netty
+  netty
+  compile
+
+
+  io.netty
   netty-all
   compile
 

svn commit: r1560831 - in /hadoop/common/trunk: hadoop-project/pom.xml hadoop-tools/hadoop-distcp/pom.xml hadoop-tools/hadoop-openstack/pom.xml pom.xml

[cos]

Author: cos
Date: Thu Jan 23 22:29:23 2014
New Revision: 1560831

URL: http://svn.apache.org/r1560831
Log:
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / 
refactoring. Contributed by Mikhail Antonov.

Modified:
hadoop/common/trunk/hadoop-project/pom.xml
hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/trunk/hadoop-tools/hadoop-openstack/pom.xml
hadoop/common/trunk/pom.xml

Modified: hadoop/common/trunk/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1560831r1=1560830r2=1560831view=diff
==
--- hadoop/common/trunk/hadoop-project/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project/pom.xml Thu Jan 23 22:29:23 2014
@@ -39,10 +39,6 @@
 !-- number of threads/forks to use when running tests in parallel, see 
parallel-tests profile --
 testsThreadCount4/testsThreadCount
 
-!-- platform encoding override --
-project.build.sourceEncodingUTF-8/project.build.sourceEncoding
-project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
-
 !-- These 2 versions are defined here becuase they are used --
 !-- JDIFF generation from embedded ant in the antrun plugin --
 jdiff.version1.0.9/jdiff.version

Modified: hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml?rev=1560831r1=1560830r2=1560831view=diff
==
--- hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml Thu Jan 23 22:29:23 
2014
@@ -33,7 +33,6 @@
   properties
 file.encodingUTF-8/file.encoding
 downloadSourcestrue/downloadSources
-project.build.sourceEncodingUTF-8/project.build.sourceEncoding
   /properties
 
   dependencies

Modified: hadoop/common/trunk/hadoop-tools/hadoop-openstack/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-openstack/pom.xml?rev=1560831r1=1560830r2=1560831view=diff
==
--- hadoop/common/trunk/hadoop-tools/hadoop-openstack/pom.xml (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-openstack/pom.xml Thu Jan 23 
22:29:23 2014
@@ -35,7 +35,6 @@
   properties
 file.encodingUTF-8/file.encoding
 downloadSourcestrue/downloadSources
-project.build.sourceEncodingUTF-8/project.build.sourceEncoding
   /properties
 
   profiles

Modified: hadoop/common/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/pom.xml?rev=1560831r1=1560830r2=1560831view=diff
==
--- hadoop/common/trunk/pom.xml (original)
+++ hadoop/common/trunk/pom.xml Thu Jan 23 22:29:23 2014
@@ -85,6 +85,10 @@ xsi:schemaLocation=http://maven.apache.
 distMgmtStagingIdapache.staging.https/distMgmtStagingId
 distMgmtStagingNameApache Release Distribution 
Repository/distMgmtStagingName
 
distMgmtStagingUrlhttps://repository.apache.org/service/local/staging/deploy/maven2/distMgmtStagingUrl
+
+!-- platform encoding override --
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
   /properties
 
   modules

svn commit: r1560831 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Thu Jan 23 22:29:23 2014
New Revision: 1560831

URL: http://svn.apache.org/r1560831
Log:
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / 
refactoring. Contributed by Mikhail Antonov.

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1560831r1=1560830r2=1560831view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 
23 22:29:23 2014
@@ -631,6 +631,9 @@ Release 2.3.0 - UNRELEASED
 
 HADOOP-10112. har file listing doesn't work with wild card. (brandonli)
 
+HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / 
refactoring
+(Mikhail Antonov via cos)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

svn commit: r1560832 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Thu Jan 23 22:31:27 2014
New Revision: 1560832

URL: http://svn.apache.org/r1560832
Log:
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / 
refactoring. Contributed by Mikhail Antonov.


Conflicts:

hadoop-common-project/hadoop-common/CHANGES.txt

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1560832r1=1560831r2=1560832view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Thu Jan 23 22:31:27 2014
@@ -338,6 +338,9 @@ Release 2.3.0 - UNRELEASED
 HADOOP-10110. hadoop-auth has a build break due to missing dependency
 (Chuan Liu via cos)
 
+HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / 
refactoring
+(Mikhail Antonov via cos)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

svn commit: r1560832 - in /hadoop/common/branches/branch-2: hadoop-project/pom.xml hadoop-tools/hadoop-distcp/pom.xml hadoop-tools/hadoop-openstack/pom.xml pom.xml

[cos]

Author: cos
Date: Thu Jan 23 22:31:27 2014
New Revision: 1560832

URL: http://svn.apache.org/r1560832
Log:
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / 
refactoring. Contributed by Mikhail Antonov.


Conflicts:

hadoop-common-project/hadoop-common/CHANGES.txt

Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-openstack/pom.xml
hadoop/common/branches/branch-2/pom.xml

Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1560832r1=1560831r2=1560832view=diff
==
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Thu Jan 23 22:31:27 
2014
@@ -39,10 +39,6 @@
 !-- number of threads/forks to use when running tests in parallel, see 
parallel-tests profile --
 testsThreadCount4/testsThreadCount
 
-!-- platform encoding override --
-project.build.sourceEncodingUTF-8/project.build.sourceEncoding
-project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
-
 !-- These 2 versions are defined here becuase they are used --
 !-- JDIFF generation from embedded ant in the antrun plugin --
 jdiff.version1.0.9/jdiff.version

Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml?rev=1560832r1=1560831r2=1560832view=diff
==
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml 
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml Thu Jan 
23 22:31:27 2014
@@ -33,7 +33,6 @@
   properties
 file.encodingUTF-8/file.encoding
 downloadSourcestrue/downloadSources
-project.build.sourceEncodingUTF-8/project.build.sourceEncoding
   /properties
 
   dependencies

Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-openstack/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-openstack/pom.xml?rev=1560832r1=1560831r2=1560832view=diff
==
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-openstack/pom.xml 
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-openstack/pom.xml Thu 
Jan 23 22:31:27 2014
@@ -35,7 +35,6 @@
   properties
 file.encodingUTF-8/file.encoding
 downloadSourcestrue/downloadSources
-project.build.sourceEncodingUTF-8/project.build.sourceEncoding
   /properties
 
   profiles

Modified: hadoop/common/branches/branch-2/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/pom.xml?rev=1560832r1=1560831r2=1560832view=diff
==
--- hadoop/common/branches/branch-2/pom.xml (original)
+++ hadoop/common/branches/branch-2/pom.xml Thu Jan 23 22:31:27 2014
@@ -85,6 +85,10 @@ xsi:schemaLocation=http://maven.apache.
 distMgmtStagingIdapache.staging.https/distMgmtStagingId
 distMgmtStagingNameApache Release Distribution 
Repository/distMgmtStagingName
 
distMgmtStagingUrlhttps://repository.apache.org/service/local/staging/deploy/maven2/distMgmtStagingUrl
+
+!-- platform encoding override --
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
   /properties
 
   modules

svn commit: r1560834 - in /hadoop/common/branches/branch-2.3: hadoop-project/pom.xml hadoop-tools/hadoop-distcp/pom.xml pom.xml

[cos]

Author: cos
Date: Thu Jan 23 22:35:16 2014
New Revision: 1560834

URL: http://svn.apache.org/r1560834
Log:
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / 
refactoring. Contributed by Mikhail Antonov.


Conflicts:

hadoop-common-project/hadoop-common/CHANGES.txt

Modified:
hadoop/common/branches/branch-2.3/hadoop-project/pom.xml
hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-2.3/pom.xml

Modified: hadoop/common/branches/branch-2.3/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-project/pom.xml?rev=1560834r1=1560833r2=1560834view=diff
==
--- hadoop/common/branches/branch-2.3/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2.3/hadoop-project/pom.xml Thu Jan 23 
22:35:16 2014
@@ -39,10 +39,6 @@
 !-- number of threads/forks to use when running tests in parallel, see 
parallel-tests profile --
 testsThreadCount4/testsThreadCount
 
-!-- platform encoding override --
-project.build.sourceEncodingUTF-8/project.build.sourceEncoding
-project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
-
 !-- These 2 versions are defined here becuase they are used --
 !-- JDIFF generation from embedded ant in the antrun plugin --
 jdiff.version1.0.9/jdiff.version

Modified: hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml?rev=1560834r1=1560833r2=1560834view=diff
==
--- hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.3/hadoop-tools/hadoop-distcp/pom.xml Thu 
Jan 23 22:35:16 2014
@@ -33,7 +33,6 @@
   properties
 file.encodingUTF-8/file.encoding
 downloadSourcestrue/downloadSources
-project.build.sourceEncodingUTF-8/project.build.sourceEncoding
   /properties
 
   dependencies

Modified: hadoop/common/branches/branch-2.3/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/pom.xml?rev=1560834r1=1560833r2=1560834view=diff
==
--- hadoop/common/branches/branch-2.3/pom.xml (original)
+++ hadoop/common/branches/branch-2.3/pom.xml Thu Jan 23 22:35:16 2014
@@ -85,6 +85,10 @@ xsi:schemaLocation=http://maven.apache.
 distMgmtStagingIdapache.staging.https/distMgmtStagingId
 distMgmtStagingNameApache Release Distribution 
Repository/distMgmtStagingName
 
distMgmtStagingUrlhttps://repository.apache.org/service/local/staging/deploy/maven2/distMgmtStagingUrl
+
+!-- platform encoding override --
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
   /properties
 
   modules

svn commit: r1560834 - /hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Thu Jan 23 22:35:16 2014
New Revision: 1560834

URL: http://svn.apache.org/r1560834
Log:
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / 
refactoring. Contributed by Mikhail Antonov.


Conflicts:

hadoop-common-project/hadoop-common/CHANGES.txt

Modified:

hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1560834r1=1560833r2=1560834view=diff
==
--- 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
 Thu Jan 23 22:35:16 2014
@@ -98,6 +98,9 @@ Release 2.3.0 - UNRELEASED
 HADOOP-10110. hadoop-auth has a build break due to missing dependency
 (Chuan Liu via cos)
 
+HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / 
refactoring
+(Mikhail Antonov via cos)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

svn commit: r1559927 - in /hadoop/common/branches/branch-2/hadoop-common-project: hadoop-auth/pom.xml hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Tue Jan 21 05:55:32 2014
New Revision: 1559927

URL: http://svn.apache.org/r1559927
Log:
HADOOP-10110. hadoop-auth has a build break due to missing dependency. 
Contributed by Chuan Liu

Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml?rev=1559927r1=1559926r2=1559927view=diff
==
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml 
(original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml 
Tue Jan 21 05:55:32 2014
@@ -59,6 +59,11 @@
 /dependency
 dependency
   groupIdorg.mortbay.jetty/groupId
+  artifactIdjetty-util/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.mortbay.jetty/groupId
   artifactIdjetty/artifactId
   scopetest/scope
 /dependency

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1559927r1=1559926r2=1559927view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Tue Jan 21 05:55:32 2014
@@ -332,6 +332,9 @@ Release 2.3.0 - UNRELEASED
 
 HADOOP-10112. har file listing doesn't work with wild card. (brandonli)
 
+HADOOP-10110. hadoop-auth has a build break due to missing dependency
+(Chuan Liu via cos)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

svn commit: r1559928 - in /hadoop/common/branches/branch-2.3/hadoop-common-project: hadoop-auth/pom.xml hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Tue Jan 21 05:55:55 2014
New Revision: 1559928

URL: http://svn.apache.org/r1559928
Log:
HADOOP-10110. hadoop-auth has a build break due to missing dependency. 
Contributed by Chuan Liu

Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml

hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml?rev=1559928r1=1559927r2=1559928view=diff
==
--- hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/pom.xml 
Tue Jan 21 05:55:55 2014
@@ -60,6 +60,11 @@
 /dependency
 dependency
   groupIdorg.mortbay.jetty/groupId
+  artifactIdjetty-util/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.mortbay.jetty/groupId
   artifactIdjetty/artifactId
   scopetest/scope
 /dependency

Modified: 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1559928r1=1559927r2=1559928view=diff
==
--- 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
 Tue Jan 21 05:55:55 2014
@@ -95,6 +95,9 @@ Release 2.3.0 - UNRELEASED
 
 HADOOP-10112. har file listing doesn't work with wild card. (brandonli)
 
+HADOOP-10110. hadoop-auth has a build break due to missing dependency
+(Chuan Liu via cos)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

svn commit: r1558215 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Tue Jan 14 21:49:59 2014
New Revision: 1558215

URL: http://svn.apache.org/r1558215
Log:
Adding 2.0.6-alpha release to the CHANGES.txt

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558215r1=1558214r2=1558215view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jan 
14 21:49:59 2014
@@ -1332,6 +1332,18 @@ Release 2.1.0-beta - 2013-08-22
 
 HADOOP-9701. mvn site ambiguous links in hadoop-common. (kkambatl via tucu)
 
+Release 2.0.6-alpha - 08/22/2013
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES

svn commit: r1558216 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Tue Jan 14 21:52:06 2014
New Revision: 1558216

URL: http://svn.apache.org/r1558216
Log:
Adding 2.0.6-alpha release to the CHANGES.txt

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558216r1=1558215r2=1558216view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Tue Jan 14 21:52:06 2014
@@ -1067,6 +1067,18 @@ Release 2.1.0-beta - 2013-08-22
 
 HADOOP-9701. mvn site ambiguous links in hadoop-common. (kkambatl via tucu)
 
+Release 2.0.6-alpha - 08/22/2013
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES

svn commit: r1558222 - /hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Tue Jan 14 22:06:24 2014
New Revision: 1558222

URL: http://svn.apache.org/r1558222
Log:
Adding 2.0.6-alpha release to the CHANGES.txt

Modified:

hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558222r1=1558221r2=1558222view=diff
==
--- 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
 Tue Jan 14 22:06:24 2014
@@ -842,6 +842,18 @@ Release 2.1.0-beta - 2013-08-22
 
 HADOOP-9701. mvn site ambiguous links in hadoop-common. (kkambatl via tucu)
 
+Release 2.0.6-alpha - 08/22/2013
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES

svn commit: r1516941 - in /hadoop/common/tags: release-2.0.6-alpha-rc1/ release-2.0.6-alpha/

[cos]

Author: cos
Date: Fri Aug 23 17:29:24 2013
New Revision: 1516941

URL: http://svn.apache.org/r1516941
Log:
Hadoop 2.0.6-alpha release

Added:
hadoop/common/tags/release-2.0.6-alpha/   (props changed)
  - copied from r1516940, hadoop/common/tags/release-2.0.6-alpha-rc1/
Removed:
hadoop/common/tags/release-2.0.6-alpha-rc1/

Propchange: hadoop/common/tags/release-2.0.6-alpha/
--
--- svn:ignore (added)
+++ svn:ignore Fri Aug 23 17:29:24 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/release-2.0.6-alpha/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 23 17:29:24 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,1302704-
 
1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1516957 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/ publish/ publish/docs/ publish/docs/r2.0.6-alpha/ publish/docs/r2.0.6-alpha/api/ publish/docs/r2.0.6-alpha/a

[cos]

Author: cos
Date: Fri Aug 23 18:06:10 2013
New Revision: 1516957

URL: http://svn.apache.org/r1516957
Log:
Updated site for release  2.0.6-alpha


[This commit notification would consist of 632 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1516988 - /hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml

[cos]

Author: cos
Date: Fri Aug 23 19:21:03 2013
New Revision: 1516988

URL: http://svn.apache.org/r1516988
Log:
Updated site for release  2.0.6-alpha: removing a typo in the link

Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml

Modified: 
hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml?rev=1516988r1=1516987r2=1516988view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/releases.xml 
Fri Aug 23 19:21:03 2013
@@ -45,7 +45,7 @@
 release.
 /p
 p Please see the a 
-
href=http://hadoop.apache.org/docs/r2.0.6-alpha/hadoop-project-dist/hadoop-common/releasenotes.html;
+
href=http://hadoop.apache.org/docs/r2.0.6-alpha/hadoop-project-dist/hadoop-common/releasenotes.html;
 Hadoop 2.0.6-alpha Release Notes/a for details.
 /p
   /section

svn commit: r1517105 - in /hadoop/common/site/main/publish: releases.html releases.pdf

[cos]

Author: cos
Date: Sat Aug 24 03:27:15 2013
New Revision: 1517105

URL: http://svn.apache.org/r1517105
Log:
Updated site for release  2.0.6-alpha: regenerting site files

Modified:
hadoop/common/site/main/publish/releases.html
hadoop/common/site/main/publish/releases.pdf

Modified: hadoop/common/site/main/publish/releases.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/releases.html?rev=1517105r1=1517104r2=1517105view=diff
==
--- hadoop/common/site/main/publish/releases.html (original)
+++ hadoop/common/site/main/publish/releases.html Sat Aug 24 03:27:15 2013
@@ -448,7 +448,7 @@ document.write(Last Published:  + docu
 hadoop-2.x uncovered during integration testing of previous
 release.
 /p
-p Please see the a 
href=http://hadoop.apache.org/docs/r2.0.6-alpha/hadoop-project-dist/hadoop-common/releasenotes.html;
+p Please see the a 
href=http://hadoop.apache.org/docs/r2.0.6-alpha/hadoop-project-dist/hadoop-common/releasenotes.html;
 Hadoop 2.0.6-alpha Release Notes/a for details.
 /p
 a name=N10061/aa 
name=1+Aug%2C+2013%3A+Release+1.2.1+%28stable%29+available/a

Modified: hadoop/common/site/main/publish/releases.pdf
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/releases.pdf?rev=1517105r1=1517104r2=1517105view=diff
==
Binary files - no diff available.

svn commit: r1514579 - /hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

[cos]

Author: cos
Date: Fri Aug 16 05:03:29 2013
New Revision: 1514579

URL: http://svn.apache.org/r1514579
Log:
Adding ASL to the releasenotes.html file

Modified:

hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

Modified: 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html?rev=1514579r1=1514578r2=1514579view=diff
==
--- 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 (original)
+++ 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 Fri Aug 16 05:03:29 2013
@@ -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.
+--
 META http-equiv=Content-Type content=text/html; charset=UTF-8
 titleHadoop  2.0.6-alpha Release Notes/title
 STYLE type=text/css

svn commit: r1514581 - /hadoop/common/tags/release-2.0.6-alpha-rc1/

[cos]

Author: cos
Date: Fri Aug 16 05:28:18 2013
New Revision: 1514581

URL: http://svn.apache.org/r1514581
Log:
Hadoop 2.0.6-alpha-rc1 release.

Added:
hadoop/common/tags/release-2.0.6-alpha-rc1/   (props changed)
  - copied from r1514579, hadoop/common/branches/branch-2.0.6-alpha/

Propchange: hadoop/common/tags/release-2.0.6-alpha-rc1/
--
--- svn:ignore (added)
+++ svn:ignore Fri Aug 16 05:28:18 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/release-2.0.6-alpha-rc1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 16 05:28:18 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,1302704-
 
1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1512843 - /hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Sun Aug 11 00:42:09 2013
New Revision: 1512843

URL: http://svn.apache.org/r1512843
Log:
Setting optimistic release date in the CHANGES.txt

Modified:

hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512843r1=1512842r2=1512843view=diff
==
--- 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Sun Aug 11 00:42:09 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 2.0.6-alpha - UNRELEASED
+Release 2.0.6-alpha - 08/17/2013
 
   INCOMPATIBLE CHANGES
 

svn commit: r1512842 [1/2] - /hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

[cos]

Author: cos
Date: Sun Aug 11 00:42:04 2013
New Revision: 1512842

URL: http://svn.apache.org/r1512842
Log:
Updating releasenotes.html

Modified:

hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

svn commit: r1512844 - /hadoop/common/tags/release-2.0.6-alpha-rc0/

[cos]

Author: cos
Date: Sun Aug 11 00:44:11 2013
New Revision: 1512844

URL: http://svn.apache.org/r1512844
Log:
Tagging 2.0.6-alpha-rc0

Added:
hadoop/common/tags/release-2.0.6-alpha-rc0/   (props changed)
  - copied from r1512843, hadoop/common/branches/branch-2.0.6-alpha/

Propchange: hadoop/common/tags/release-2.0.6-alpha-rc0/
--
--- svn:ignore (added)
+++ svn:ignore Sun Aug 11 00:44:11 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/release-2.0.6-alpha-rc0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 11 00:44:11 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,1302704-
 
1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1512849 [1/2] - /hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

[cos]

Author: cos
Date: Sun Aug 11 02:12:14 2013
New Revision: 1512849

URL: http://svn.apache.org/r1512849
Log:
Revert Updating releasenotes.html

This reverts commit 12b73ad69739dac5e332294c1179faae494220ef.

The releasenotes prepare script goes wild.

Modified:

hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

svn commit: r1512850 - /hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

[cos]

Author: cos
Date: Sun Aug 11 02:12:17 2013
New Revision: 1512850

URL: http://svn.apache.org/r1512850
Log:
Updating release notes for the release

Modified:

hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

Modified: 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html?rev=1512850r1=1512849r2=1512850view=diff
==
--- 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 (original)
+++ 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 Sun Aug 11 02:12:17 2013
@@ -1,4 +1,24 @@
 META http-equiv=Content-Type content=text/html; charset=UTF-8
+titleHadoop  2.0.6-alpha Release Notes/title
+STYLE type=text/css
+   H1 {font-family: sans-serif}
+   H2 {font-family: sans-serif; margin-left: 7mm}
+   TABLE {margin-left: 7mm}
+/STYLE
+/head
+body
+h1Hadoop  2.0.6-alpha Release Notes/h1
+These release notes include new developer and user-facing incompatibilities, 
features, and major improvements.
+a name=changes/
+h2Changes since Hadoop 2.0.5-alpha/h2
+ul
+li a href=https://issues.apache.org/jira/browse/YARN-854;YARN-854/a.
+App submission fails on secure deploybr b
+Fixing YARN bugs that are failing applications in secure environment.
+/bbr blockquoteCommitted to branch-2.0.6 Modified changes.txt in
+trunk, branch-2 and branch-2.0.6-alpha accordingly/blockquote/li
+/ul
+/body/html
 titleHadoop  2.0.5-alpha Release Notes/title
 STYLE type=text/css
H1 {font-family: sans-serif}

svn commit: r1512851 - /hadoop/common/tags/release-2.0.6-alpha-rc0/

[cos]

Author: cos
Date: Sun Aug 11 02:16:04 2013
New Revision: 1512851

URL: http://svn.apache.org/r1512851
Log:
Need to retag release-2.0.6-alpha-rc0

Removed:
hadoop/common/tags/release-2.0.6-alpha-rc0/

svn commit: r1512855 - /hadoop/common/tags/release-2.0.6-alpha-rc0/

[cos]

Author: cos
Date: Sun Aug 11 02:42:39 2013
New Revision: 1512855

URL: http://svn.apache.org/r1512855
Log:
Hadoop 2.0.6-alpha-rc0 release.

Added:
hadoop/common/tags/release-2.0.6-alpha-rc0/   (props changed)
  - copied from r1512854, hadoop/common/branches/branch-2.0.6-alpha/

Propchange: hadoop/common/tags/release-2.0.6-alpha-rc0/
--
--- svn:ignore (added)
+++ svn:ignore Sun Aug 11 02:42:39 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/release-2.0.6-alpha-rc0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 11 02:42:39 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,1302704-
 
1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1509059 - in /hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project: hadoop-annotations/pom.xml hadoop-auth-examples/pom.xml hadoop-auth/pom.xml hadoop-common/pom.xml pom.xml

[cos]

Author: cos
Date: Thu Aug  1 00:49:23 2013
New Revision: 1509059

URL: http://svn.apache.org/r1509059
Log:
Preparing release 2.0.6-alpha: setting version of the artifacts to 2.0.6-alpha

Modified:

hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-annotations/pom.xml

hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml

hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth/pom.xml

hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/pom.xml

Modified: 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-annotations/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-annotations/pom.xml?rev=1509059r1=1509058r2=1509059view=diff
==
--- 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-annotations/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-annotations/pom.xml
 Thu Aug  1 00:49:23 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-alpha/version
+version2.0.6-alpha/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-annotations/artifactId
-  version2.0.5-alpha/version
+  version2.0.6-alpha/version
   descriptionApache Hadoop Annotations/description
   nameApache Hadoop Annotations/name
   packagingjar/packaging

Modified: 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1509059r1=1509058r2=1509059view=diff
==
--- 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
 Thu Aug  1 00:49:23 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-alpha/version
+version2.0.6-alpha/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth-examples/artifactId
-  version2.0.5-alpha/version
+  version2.0.6-alpha/version
   packagingwar/packaging
 
   nameApache Hadoop Auth Examples/name

Modified: 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth/pom.xml?rev=1509059r1=1509058r2=1509059view=diff
==
--- 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-auth/pom.xml
 Thu Aug  1 00:49:23 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-alpha/version
+version2.0.6-alpha/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth/artifactId
-  version2.0.5-alpha/version
+  version2.0.6-alpha/version
   packagingjar/packaging
 
   nameApache Hadoop Auth/name

Modified: 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/pom.xml?rev=1509059r1=1509058r2=1509059view=diff
==
--- 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/hadoop-common/pom.xml
 Thu Aug  1 00:49:23 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.5-alpha/version
+version2.0.6-alpha/version
 relativePath../../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-common/artifactId
-  version2.0.5-alpha/version
+  version2.0.6-alpha/version
   descriptionApache Hadoop Common/description
   nameApache Hadoop Common/name
   packagingjar/packaging

Modified: 
hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-common-project/pom.xml?rev=1509059r1=1509058r2=1509059view

svn commit: r1509059 - in /hadoop/common/branches/branch-2.0.6-alpha: ./ hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-maven-plugins/ hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ h

[cos]

Author: cos
Date: Thu Aug  1 00:49:23 2013
New Revision: 1509059

URL: http://svn.apache.org/r1509059
Log:
Preparing release 2.0.6-alpha: setting version of the artifacts to 2.0.6-alpha

Modified:
hadoop/common/branches/branch-2.0.6-alpha/hadoop-assemblies/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-client/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-dist/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-maven-plugins/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-minicluster/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-project-dist/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-project/pom.xml

hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/hadoop-archives/pom.xml

hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/hadoop-extras/pom.xml

hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/hadoop-gridmix/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/hadoop-rumen/pom.xml

hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/hadoop-streaming/pom.xml

hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/hadoop-tools/pom.xml
hadoop/common/branches/branch-2.0.6-alpha/pom.xml

Modified: hadoop/common/branches/branch-2.0.6-alpha/hadoop-assemblies/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-assemblies/pom.xml?rev=1509059r1=1509058r2=1509059view=diff
==
--- hadoop/common/branches/branch-2.0.6-alpha/hadoop-assemblies/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.0.6-alpha/hadoop-assemblies/pom.xml Thu Aug 
 1 00:49:23 2013
@@ -23,12 +23,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-alpha/version
+version2.0.6-alpha/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-assemblies/artifactId
-  version2.0.5-alpha/version
+  version2.0.6-alpha/version
   nameApache Hadoop Assemblies/name
   descriptionApache Hadoop Assemblies/description
 

Modified: hadoop/common/branches/branch-2.0.6-alpha/hadoop-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-client/pom.xml?rev=1509059r1=1509058r2=1509059view=diff
==
--- hadoop/common/branches/branch-2.0.6-alpha/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.6-alpha/hadoop-client/pom.xml Thu Aug  1 
00:49:23 2013
@@ -18,12 +18,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.5-alpha/version
+version2.0.6-alpha/version
 relativePath../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-client/artifactId
-  version2.0.5-alpha/version
+  version2.0.6-alpha/version
   packagingjar/packaging
 
   descriptionApache Hadoop Client/description

Modified: hadoop/common/branches/branch-2.0.6-alpha/hadoop-dist/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-dist/pom.xml?rev=1509059r1=1509058r2=1509059view=diff
==
--- hadoop/common/branches/branch-2.0.6-alpha/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.6-alpha/hadoop-dist/pom.xml Thu Aug  1 
00:49:23 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-alpha/version
+version2.0.6-alpha/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-dist/artifactId
-  version2.0.5-alpha/version
+  version2.0.6-alpha/version
   descriptionApache Hadoop Distribution/description
   nameApache Hadoop Distribution/name
   packagingjar/packaging

Modified: hadoop/common/branches/branch-2.0.6-alpha/hadoop-maven-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.6-alpha/hadoop-maven-plugins/pom.xml?rev=1509059r1=1509058r2=1509059view=diff
==
--- hadoop/common/branches/branch-2.0.6-alpha/hadoop-maven-plugins/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.0.6-alpha/hadoop-maven-plugins/pom.xml Thu 
Aug  1 00:49:23 2013
@@ -19,7 +19,7 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-alpha/version

svn commit: r1500139 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source: JvmMetrics.java JvmMetricsInfo.java

[cos]

Author: cos
Date: Fri Jul  5 21:36:20 2013
New Revision: 1500139

URL: http://svn.apache.org/r1500139
Log:
HDFS-4860. Add additional attributes to JMX beans. Contributed by Trevor Lorimer

Modified:

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java?rev=1500139r1=1500138r2=1500139view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
 Fri Jul  5 21:36:20 2013
@@ -101,8 +101,10 @@ public class JvmMetrics implements Metri
 Runtime runtime = Runtime.getRuntime();
 rb.addGauge(MemNonHeapUsedM, memNonHeap.getUsed() / M)
   .addGauge(MemNonHeapCommittedM, memNonHeap.getCommitted() / M)
+  .addGauge(MemNonHeapMaxM, memNonHeap.getMax() / M)
   .addGauge(MemHeapUsedM, memHeap.getUsed() / M)
   .addGauge(MemHeapCommittedM, memHeap.getCommitted() / M)
+  .addGauge(MemHeapMaxM, memHeap.getMax() / M)
   .addGauge(MemMaxM, runtime.maxMemory() / M);
   }
 

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java?rev=1500139r1=1500138r2=1500139view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
 Fri Jul  5 21:36:20 2013
@@ -32,8 +32,10 @@ public enum JvmMetricsInfo implements Me
   // metrics
   MemNonHeapUsedM(Non-heap memory used in MB),
   MemNonHeapCommittedM(Non-heap memory committed in MB),
+  MemNonHeapMaxM(Non-heap memory max in MB),
   MemHeapUsedM(Heap memory used in MB),
   MemHeapCommittedM(Heap memory committed in MB),
+  MemHeapMaxM(Heap memory max in MB),
   MemMaxM(Max memory size in MB),
   GcCount(Total GC count),
   GcTimeMillis(Total GC time in milliseconds),

svn commit: r1500140 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source: JvmMetrics.java JvmMetricsInfo.java

[cos]

Author: cos
Date: Fri Jul  5 21:40:46 2013
New Revision: 1500140

URL: http://svn.apache.org/r1500140
Log:
HDFS-4860. Add additional attributes to JMX beans. Contributed by Trevor Lorimer

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java?rev=1500140r1=1500139r2=1500140view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
 Fri Jul  5 21:40:46 2013
@@ -101,8 +101,10 @@ public class JvmMetrics implements Metri
 Runtime runtime = Runtime.getRuntime();
 rb.addGauge(MemNonHeapUsedM, memNonHeap.getUsed() / M)
   .addGauge(MemNonHeapCommittedM, memNonHeap.getCommitted() / M)
+  .addGauge(MemNonHeapMaxM, memNonHeap.getMax() / M)
   .addGauge(MemHeapUsedM, memHeap.getUsed() / M)
   .addGauge(MemHeapCommittedM, memHeap.getCommitted() / M)
+  .addGauge(MemHeapMaxM, memHeap.getMax() / M)
   .addGauge(MemMaxM, runtime.maxMemory() / M);
   }
 

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java?rev=1500140r1=1500139r2=1500140view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
 Fri Jul  5 21:40:46 2013
@@ -32,8 +32,10 @@ public enum JvmMetricsInfo implements Me
   // metrics
   MemNonHeapUsedM(Non-heap memory used in MB),
   MemNonHeapCommittedM(Non-heap memory committed in MB),
+  MemNonHeapMaxM(Non-heap memory max in MB),
   MemHeapUsedM(Heap memory used in MB),
   MemHeapCommittedM(Heap memory committed in MB),
+  MemHeapMaxM(Heap memory max in MB),
   MemMaxM(Max memory size in MB),
   GcCount(Total GC count),
   GcTimeMillis(Total GC time in milliseconds),

svn commit: r1491058 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/ publish/ publish/docs/ publish/docs/r2.0.5-alpha/ publish/docs/r2.0.5-alpha/api/ publish/docs/r2.0.5-alpha/a

[cos]

Author: cos
Date: Sat Jun  8 20:40:04 2013
New Revision: 1491058

URL: http://svn.apache.org/r1491058
Log:
Updated site for release 2.0.5-alpha


[This commit notification would consist of 625 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1491065 [1/2] - /hadoop/common/site/main/publish/docs/r2.0.5-alpha/hadoop-project-dist/hadoop-common/releasenotes.html

[cos]

Author: cos
Date: Sat Jun  8 21:25:50 2013
New Revision: 1491065

URL: http://svn.apache.org/r1491065
Log:
Updated site for release 2.0.5-alpha: missing releasenotes.html

Added:

hadoop/common/site/main/publish/docs/r2.0.5-alpha/hadoop-project-dist/hadoop-common/releasenotes.html

svn commit: r1491137 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Sun Jun  9 04:51:28 2013
New Revision: 1491137

URL: http://svn.apache.org/r1491137
Log:
Setting 2.0.5-alpha release date

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491137r1=1491136r2=1491137view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Sun Jun  9 04:51:28 2013
@@ -435,7 +435,7 @@ Release 2.1.0-beta - UNRELEASED
 HADOOP-9599. hadoop-config.cmd doesn't set JAVA_LIBRARY_PATH correctly.
 (Mostafa Elhemali via ivanmi)
 
-Release 2.0.5-alpha - UNRELEASED
+Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES
 

svn commit: r1491139 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Sun Jun  9 04:55:26 2013
New Revision: 1491139

URL: http://svn.apache.org/r1491139
Log:
Setting release date for 2.0.5-alpha release

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491139r1=1491138r2=1491139view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Sun Jun 
 9 04:55:26 2013
@@ -757,7 +757,7 @@ Release 2.1.0-beta - UNRELEASED
 HADOOP-9599. hadoop-config.cmd doesn't set JAVA_LIBRARY_PATH correctly.
 (Mostafa Elhemali via ivanmi)
 
-Release 2.0.5-alpha - UNRELEASED
+Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES
 

svn commit: r1491138 - /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Sun Jun  9 04:55:15 2013
New Revision: 1491138

URL: http://svn.apache.org/r1491138
Log:
Setting release date for 2.0.5-alpha

Modified:

hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491138r1=1491137r2=1491138view=diff
==
--- 
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
 Sun Jun  9 04:55:15 2013
@@ -411,7 +411,7 @@ Release 2.1.0-beta - UNRELEASED
 HADOOP-9599. hadoop-config.cmd doesn't set JAVA_LIBRARY_PATH correctly.
 (Mostafa Elhemali via ivanmi)
 
-Release 2.0.5-alpha - UNRELEASED
+Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES
 

svn commit: r1490503 - in /hadoop/common/tags: release-2.0.5-alpha-rc2/ release-2.0.5-alpha/

[cos]

Author: cos
Date: Fri Jun  7 03:57:14 2013
New Revision: 1490503

URL: http://svn.apache.org/r1490503
Log:
Hadoop 2.0.5-alpha release.

Added:
hadoop/common/tags/release-2.0.5-alpha/   (props changed)
  - copied from r1490502, hadoop/common/tags/release-2.0.5-alpha-rc2/
Removed:
hadoop/common/tags/release-2.0.5-alpha-rc2/

Propchange: hadoop/common/tags/release-2.0.5-alpha/
--
--- svn:ignore (added)
+++ svn:ignore Fri Jun  7 03:57:14 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/release-2.0.5-alpha/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun  7 03:57:14 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,
 
1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1489118 - /hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Mon Jun  3 19:30:28 2013
New Revision: 1489118

URL: http://svn.apache.org/r1489118
Log:
Setting optimistic release date in the CHANGES.txt

Modified:

hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489118r1=1489117r2=1489118view=diff
==
--- 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Mon Jun  3 19:30:28 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 2.0.5-alpha - UNRELEASED
+Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES
 

svn commit: r1489127 - /hadoop/common/tags/2.0.5-alpha-rc2/

[cos]

Author: cos
Date: Mon Jun  3 19:45:34 2013
New Revision: 1489127

URL: http://svn.apache.org/r1489127
Log:
Tagging 2.0.5-alpha-rc2 release

Added:
hadoop/common/tags/2.0.5-alpha-rc2/   (props changed)
  - copied from r1489118, hadoop/common/branches/branch-2.0.5-alpha/

Propchange: hadoop/common/tags/2.0.5-alpha-rc2/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jun  3 19:45:34 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/2.0.5-alpha-rc2/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jun  3 19:45:34 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,
 
1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1489128 - in /hadoop/common/tags: 2.0.5-alpha-rc2/ release-2.0.5-alpha-rc2/

[cos]

Author: cos
Date: Mon Jun  3 19:49:18 2013
New Revision: 1489128

URL: http://svn.apache.org/r1489128
Log:
Wrong name of the release-2.0.5-alpha-rc2 tag

Added:
hadoop/common/tags/release-2.0.5-alpha-rc2/   (props changed)
  - copied from r1489127, hadoop/common/tags/2.0.5-alpha-rc2/
Removed:
hadoop/common/tags/2.0.5-alpha-rc2/

Propchange: hadoop/common/tags/release-2.0.5-alpha-rc2/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jun  3 19:49:18 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/release-2.0.5-alpha-rc2/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jun  3 19:49:18 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,
 
1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1488585 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Sat Jun  1 20:06:32 2013
New Revision: 1488585

URL: http://svn.apache.org/r1488585
Log:
Adding 2.0.5-alpha release to CHANGES.txt files of branch-2

Also updating current version to 2.1.0-beta in the CHANGES.txt files

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1488585r1=1488584r2=1488585view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Sat Jun  1 20:06:32 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 2.0.5-beta - UNRELEASED
+Release 2.1.0-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
@@ -379,7 +379,7 @@ Release 2.0.5-beta - UNRELEASED
 
 HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
 
-Release 2.0.4-alpha - 2013-04-25 
+Release 2.0.5-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES
 

svn commit: r1488586 - in /hadoop/common/branches/branch-2/hadoop-common-project: hadoop-annotations/pom.xml hadoop-auth-examples/pom.xml hadoop-auth/pom.xml hadoop-common/pom.xml pom.xml

[cos]

Author: cos
Date: Sat Jun  1 20:06:41 2013
New Revision: 1488586

URL: http://svn.apache.org/r1488586
Log:
Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 
2,0.5-alpha

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/branch-2/hadoop-common-project/pom.xml

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml?rev=1488586r1=1488585r2=1488586view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/pom.xml
 Sat Jun  1 20:06:41 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-SNAPSHOT/version
+version2.1.0-SNAPSHOT/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-annotations/artifactId
-  version2.0.5-SNAPSHOT/version
+  version2.1.0-SNAPSHOT/version
   descriptionApache Hadoop Annotations/description
   nameApache Hadoop Annotations/name
   packagingjar/packaging

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1488586r1=1488585r2=1488586view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth-examples/pom.xml
 Sat Jun  1 20:06:41 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-SNAPSHOT/version
+version2.1.0-SNAPSHOT/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth-examples/artifactId
-  version2.0.5-SNAPSHOT/version
+  version2.1.0-SNAPSHOT/version
   packagingwar/packaging
 
   nameApache Hadoop Auth Examples/name

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml?rev=1488586r1=1488585r2=1488586view=diff
==
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml 
(original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/pom.xml 
Sat Jun  1 20:06:41 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-SNAPSHOT/version
+version2.1.0-SNAPSHOT/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth/artifactId
-  version2.0.5-SNAPSHOT/version
+  version2.1.0-SNAPSHOT/version
   packagingjar/packaging
 
   nameApache Hadoop Auth/name

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml?rev=1488586r1=1488585r2=1488586view=diff
==
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml 
(original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml 
Sat Jun  1 20:06:41 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.5-SNAPSHOT/version
+version2.1.0-SNAPSHOT/version
 relativePath../../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-common/artifactId
-  version2.0.5-SNAPSHOT/version
+  version2.1.0-SNAPSHOT/version
   descriptionApache Hadoop Common/description
   nameApache Hadoop Common/name
   packagingjar/packaging

Modified: hadoop/common/branches/branch-2/hadoop-common-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/pom.xml?rev=1488586r1=1488585r2=1488586view=diff
==
--- hadoop/common/branches/branch-2/hadoop-common-project/pom.xml (original)
+++ hadoop/common

svn commit: r1488586 - in /hadoop/common/branches/branch-2: ./ hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-maven-plugins/ hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ hadoop-tool

[cos]

Author: cos
Date: Sat Jun  1 20:06:41 2013
New Revision: 1488586

URL: http://svn.apache.org/r1488586
Log:
Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 
2,0.5-alpha

Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml
hadoop/common/branches/branch-2/hadoop-client/pom.xml
hadoop/common/branches/branch-2/hadoop-dist/pom.xml
hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml
hadoop/common/branches/branch-2/hadoop-minicluster/pom.xml
hadoop/common/branches/branch-2/hadoop-project-dist/pom.xml
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-archives/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-extras/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/pom.xml
hadoop/common/branches/branch-2/pom.xml

Modified: hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml?rev=1488586r1=1488585r2=1488586view=diff
==
--- hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-assemblies/pom.xml Sat Jun  1 
20:06:41 2013
@@ -23,12 +23,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-SNAPSHOT/version
+version2.1.0-SNAPSHOT/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-assemblies/artifactId
-  version2.0.5-SNAPSHOT/version
+  version2.1.0-SNAPSHOT/version
   nameApache Hadoop Assemblies/name
   descriptionApache Hadoop Assemblies/description
 

Modified: hadoop/common/branches/branch-2/hadoop-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-client/pom.xml?rev=1488586r1=1488585r2=1488586view=diff
==
--- hadoop/common/branches/branch-2/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-client/pom.xml Sat Jun  1 20:06:41 
2013
@@ -18,12 +18,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.5-SNAPSHOT/version
+version2.1.0-SNAPSHOT/version
 relativePath../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-client/artifactId
-  version2.0.5-SNAPSHOT/version
+  version2.1.0-SNAPSHOT/version
   packagingjar/packaging
 
   descriptionApache Hadoop Client/description

Modified: hadoop/common/branches/branch-2/hadoop-dist/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-dist/pom.xml?rev=1488586r1=1488585r2=1488586view=diff
==
--- hadoop/common/branches/branch-2/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-dist/pom.xml Sat Jun  1 20:06:41 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-SNAPSHOT/version
+version2.1.0-SNAPSHOT/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-dist/artifactId
-  version2.0.5-SNAPSHOT/version
+  version2.1.0-SNAPSHOT/version
   descriptionApache Hadoop Distribution/description
   nameApache Hadoop Distribution/name
   packagingjar/packaging

Modified: hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml?rev=1488586r1=1488585r2=1488586view=diff
==
--- hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-maven-plugins/pom.xml Sat Jun  1 
20:06:41 2013
@@ -19,7 +19,7 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.5-SNAPSHOT/version
+version2.1.0-SNAPSHOT/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId

Modified: hadoop/common/branches/branch-2/hadoop-minicluster/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-minicluster/pom.xml?rev

svn commit: r1488587 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Sat Jun  1 20:07:03 2013
New Revision: 1488587

URL: http://svn.apache.org/r1488587
Log:
Adding 2.0.5-alpha release to CHANGES.txt files of trunk

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1488587r1=1488586r2=1488587view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Sat Jun 
 1 20:07:03 2013
@@ -369,7 +369,7 @@ Trunk (Unreleased)
 HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
 
 
-Release 2.0.5-beta - UNRELEASED
+Release 2.1.0-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
@@ -743,7 +743,22 @@ Release 2.0.5-beta - UNRELEASED
 
 HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
 
-Release 2.0.4-alpha - 2013-04-25 
+Release 2.0.5-alpha - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+  HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing
+  build issues. (Sangjin Lee via suresh)
+
+Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES
 

svn commit: r1488387 - /hadoop/common/branches/branch-2.0.5-alpha/

[cos]

Author: cos
Date: Fri May 31 20:29:02 2013
New Revision: 1488387

URL: http://svn.apache.org/r1488387
Log:
Cutting branch-2.0.5-alpha from branch-2.0.4-alpha at r1484569

Added:
hadoop/common/branches/branch-2.0.5-alpha/   (props changed)
  - copied from r1484569, hadoop/common/branches/branch-2.0.4-alpha/

Propchange: hadoop/common/branches/branch-2.0.5-alpha/
--
--- svn:ignore (added)
+++ svn:ignore Fri May 31 20:29:02 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/branches/branch-2.0.5-alpha/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 31 20:29:02 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,
 
1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1488416 - in /hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project: hadoop-annotations/pom.xml hadoop-auth-examples/pom.xml hadoop-auth/pom.xml hadoop-common/pom.xml pom.xml

[cos]

Author: cos
Date: Fri May 31 22:14:18 2013
New Revision: 1488416

URL: http://svn.apache.org/r1488416
Log:
Preparing release 2.0.5-alpha: setting version of the artifacts to 2.0.5-alpha

Modified:

hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-annotations/pom.xml

hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml

hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth/pom.xml

hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/pom.xml

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-annotations/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-annotations/pom.xml?rev=1488416r1=1488415r2=1488416view=diff
==
--- 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-annotations/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-annotations/pom.xml
 Fri May 31 22:14:18 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.5-alpha/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-annotations/artifactId
-  version2.0.4-alpha/version
+  version2.0.5-alpha/version
   descriptionApache Hadoop Annotations/description
   nameApache Hadoop Annotations/name
   packagingjar/packaging

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1488416r1=1488415r2=1488416view=diff
==
--- 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
 Fri May 31 22:14:18 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.5-alpha/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth-examples/artifactId
-  version2.0.4-alpha/version
+  version2.0.5-alpha/version
   packagingwar/packaging
 
   nameApache Hadoop Auth Examples/name

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth/pom.xml?rev=1488416r1=1488415r2=1488416view=diff
==
--- 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-auth/pom.xml
 Fri May 31 22:14:18 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.5-alpha/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth/artifactId
-  version2.0.4-alpha/version
+  version2.0.5-alpha/version
   packagingjar/packaging
 
   nameApache Hadoop Auth/name

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/pom.xml?rev=1488416r1=1488415r2=1488416view=diff
==
--- 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/pom.xml
 Fri May 31 22:14:18 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.4-alpha/version
+version2.0.5-alpha/version
 relativePath../../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-common/artifactId
-  version2.0.4-alpha/version
+  version2.0.5-alpha/version
   descriptionApache Hadoop Common/description
   nameApache Hadoop Common/name
   packagingjar/packaging

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/pom.xml?rev=1488416r1=1488415r2=1488416view

svn commit: r1488416 - in /hadoop/common/branches/branch-2.0.5-alpha: ./ hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-maven-plugins/ hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ h

[cos]

Author: cos
Date: Fri May 31 22:14:18 2013
New Revision: 1488416

URL: http://svn.apache.org/r1488416
Log:
Preparing release 2.0.5-alpha: setting version of the artifacts to 2.0.5-alpha

Modified:
hadoop/common/branches/branch-2.0.5-alpha/hadoop-assemblies/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-client/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-dist/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-maven-plugins/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-minicluster/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-project-dist/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-project/pom.xml

hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/hadoop-archives/pom.xml

hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/hadoop-extras/pom.xml

hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/hadoop-gridmix/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/hadoop-rumen/pom.xml

hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/hadoop-streaming/pom.xml

hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/hadoop-tools/pom.xml
hadoop/common/branches/branch-2.0.5-alpha/pom.xml

Modified: hadoop/common/branches/branch-2.0.5-alpha/hadoop-assemblies/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-assemblies/pom.xml?rev=1488416r1=1488415r2=1488416view=diff
==
--- hadoop/common/branches/branch-2.0.5-alpha/hadoop-assemblies/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.0.5-alpha/hadoop-assemblies/pom.xml Fri May 
31 22:14:18 2013
@@ -23,12 +23,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.5-alpha/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-assemblies/artifactId
-  version2.0.4-alpha/version
+  version2.0.5-alpha/version
   nameApache Hadoop Assemblies/name
   descriptionApache Hadoop Assemblies/description
 

Modified: hadoop/common/branches/branch-2.0.5-alpha/hadoop-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-client/pom.xml?rev=1488416r1=1488415r2=1488416view=diff
==
--- hadoop/common/branches/branch-2.0.5-alpha/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.5-alpha/hadoop-client/pom.xml Fri May 31 
22:14:18 2013
@@ -18,12 +18,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.4-alpha/version
+version2.0.5-alpha/version
 relativePath../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-client/artifactId
-  version2.0.4-alpha/version
+  version2.0.5-alpha/version
   packagingjar/packaging
 
   descriptionApache Hadoop Client/description

Modified: hadoop/common/branches/branch-2.0.5-alpha/hadoop-dist/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-dist/pom.xml?rev=1488416r1=1488415r2=1488416view=diff
==
--- hadoop/common/branches/branch-2.0.5-alpha/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.5-alpha/hadoop-dist/pom.xml Fri May 31 
22:14:18 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.5-alpha/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-dist/artifactId
-  version2.0.4-alpha/version
+  version2.0.5-alpha/version
   descriptionApache Hadoop Distribution/description
   nameApache Hadoop Distribution/name
   packagingjar/packaging

Modified: hadoop/common/branches/branch-2.0.5-alpha/hadoop-maven-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-maven-plugins/pom.xml?rev=1488416r1=1488415r2=1488416view=diff
==
--- hadoop/common/branches/branch-2.0.5-alpha/hadoop-maven-plugins/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.0.5-alpha/hadoop-maven-plugins/pom.xml Fri 
May 31 22:14:18 2013
@@ -19,7 +19,7 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version

svn commit: r1488413 - /hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Fri May 31 22:14:04 2013
New Revision: 1488413

URL: http://svn.apache.org/r1488413
Log:
HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing build 
issues. Contributed by Sangjin Lee.

Modified:

hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1488413r1=1488412r2=1488413view=diff
==
--- 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Fri May 31 22:14:04 2013
@@ -1,6 +1,24 @@
 Hadoop Change Log
 
-Release 2.0.4-alpha - UNRELEASED
+Release 2.0.4.1-alpha - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+  MAPREDUCE-5240 inside of FileOutputCommitter the initialized Credentials 
cache
+  appears to be empty. (vinodkv)
+
+  HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing
+  build issues. (Sangjin Lee via suresh)
+
+Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES
 

svn commit: r1488415 - /hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Fri May 31 22:14:09 2013
New Revision: 1488415

URL: http://svn.apache.org/r1488415
Log:
Fixing CHANGES.txt before release

Modified:

hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1488415r1=1488414r2=1488415view=diff
==
--- 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Fri May 31 22:14:09 2013
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 2.0.4.1-alpha - UNRELEASED
+Release 2.0.5-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
@@ -12,9 +12,6 @@ Release 2.0.4.1-alpha - UNRELEASED
 
   BUG FIXES
 
-  MAPREDUCE-5240 inside of FileOutputCommitter the initialized Credentials 
cache
-  appears to be empty. (vinodkv)
-
   HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing
   build issues. (Sangjin Lee via suresh)
 

svn commit: r1488413 - /hadoop/common/branches/branch-2.0.5-alpha/hadoop-project/pom.xml

[cos]

Author: cos
Date: Fri May 31 22:14:04 2013
New Revision: 1488413

URL: http://svn.apache.org/r1488413
Log:
HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing build 
issues. Contributed by Sangjin Lee.

Modified:
hadoop/common/branches/branch-2.0.5-alpha/hadoop-project/pom.xml

Modified: hadoop/common/branches/branch-2.0.5-alpha/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-project/pom.xml?rev=1488413r1=1488412r2=1488413view=diff
==
--- hadoop/common/branches/branch-2.0.5-alpha/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.5-alpha/hadoop-project/pom.xml Fri May 31 
22:14:04 2013
@@ -46,7 +46,7 @@
 
 hadoop.assemblies.version${project.version}/hadoop.assemblies.version
 
-commons-daemon.version1.0.3/commons-daemon.version
+commons-daemon.version1.0.13/commons-daemon.version
 
 test.build.dir${project.build.directory}/test-dir/test.build.dir
 test.build.data${test.build.dir}/test.build.data

svn commit: r1488414 - /hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

[cos]

Author: cos
Date: Fri May 31 22:14:06 2013
New Revision: 1488414

URL: http://svn.apache.org/r1488414
Log:
Updating releasenotes.html for 2.0.5 release

Modified:

hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html?rev=1488414r1=1488413r2=1488414view=diff
==
--- 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 (original)
+++ 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 Fri May 31 22:14:06 2013
@@ -6,7 +6,21 @@
TABLE {margin-left: 7mm}
 /STYLE
 /head
-body
+bodyhtml
+h1Hadoop  2.0.5-alpha Release Notes/h1
+These release notes include new developer and user-facing incompatibilities, 
features, and major improvements. 
+a name=changes/
+h2Changes since Hadoop 2.0.4-alpha/h2
+ul
+li a 
href='https://issues.apache.org/jira/browse/HADOOP-9407'HADOOP-9407/a.
+ commons-daemon 1.0.3 dependency has bad group id causing build issues/br
+ blockquoteCommitted to branch-2.0.5 Modified changes.txt in trunk, 
branch-2 and branch-2.0.5-alpha accordingly./blockquote/li
+li a 
href='https://issues.apache.org/jira/browse/MAPREDUCE-5240'MAPREDUCE-5240/a.
+ inside of FileOutputCommitter the initialized Credentials cache appears 
to be empty/br
+ blockquoteCommitted to branch-2.0.5 Modified changes.txt in trunk, 
branch-2 and branch-2.0.5-alpha accordingly./blockquote/li
+/li
+/ul
+/body/html
 h1Hadoop  2.0.4-alpha Release Notes/h1
 These release notes include new developer and user-facing incompatibilities, 
features, and major improvements. 
 a name=changes/

svn commit: r1488420 - /hadoop/common/tags/release-2.0.4.1-alpha-rc0/

[cos]

Author: cos
Date: Fri May 31 22:20:39 2013
New Revision: 1488420

URL: http://svn.apache.org/r1488420
Log:
2.0.4.1-alpha release has been moved to 2.0.5-alpha

Removed:
hadoop/common/tags/release-2.0.4.1-alpha-rc0/

svn commit: r1488419 - /hadoop/common/branches/branch-2.0.5/

[cos]

Author: cos
Date: Fri May 31 22:20:03 2013
New Revision: 1488419

URL: http://svn.apache.org/r1488419
Log:
The branch is no longer needed

Removed:
hadoop/common/branches/branch-2.0.5/

svn commit: r1488426 - /hadoop/common/tags/release-2.0.5-alpha-rc0/

[cos]

Author: cos
Date: Fri May 31 22:50:58 2013
New Revision: 1488426

URL: http://svn.apache.org/r1488426
Log:
Tagging 2.0.5-alpha-rc0 release

Added:
hadoop/common/tags/release-2.0.5-alpha-rc0/   (props changed)
  - copied from r1488416, hadoop/common/branches/branch-2.0.5-alpha/

Propchange: hadoop/common/tags/release-2.0.5-alpha-rc0/
--
--- svn:ignore (added)
+++ svn:ignore Fri May 31 22:50:58 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/release-2.0.5-alpha-rc0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 31 22:50:58 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,
 
1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1488457 - /hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

[cos]

Author: cos
Date: Sat Jun  1 03:46:13 2013
New Revision: 1488457

URL: http://svn.apache.org/r1488457
Log:
Updating title for releasenotes to reflect 2.0.5-alpha release

Modified:

hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

Modified: 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html?rev=1488457r1=1488456r2=1488457view=diff
==
--- 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 (original)
+++ 
hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 Sat Jun  1 03:46:13 2013
@@ -1,5 +1,5 @@
 META http-equiv=Content-Type content=text/html; charset=UTF-8
-titleHadoop  2.0.4-alpha Release Notes/title
+titleHadoop  2.0.5-alpha Release Notes/title
 STYLE type=text/css
H1 {font-family: sans-serif}
H2 {font-family: sans-serif; margin-left: 7mm}

svn commit: r1488460 - /hadoop/common/tags/release-2.0.5-alpha-rc1/

[cos]

Author: cos
Date: Sat Jun  1 04:33:17 2013
New Revision: 1488460

URL: http://svn.apache.org/r1488460
Log:
Tagging 2.0.5-alpha-rc1 release

Added:
hadoop/common/tags/release-2.0.5-alpha-rc1/   (props changed)
  - copied from r1488457, hadoop/common/branches/branch-2.0.5-alpha/

Propchange: hadoop/common/tags/release-2.0.5-alpha-rc1/
--
--- svn:ignore (added)
+++ svn:ignore Sat Jun  1 04:33:17 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/release-2.0.5-alpha-rc1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Jun  1 04:33:17 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,
 
1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1487980 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java

[cos]

Author: cos
Date: Thu May 30 19:09:26 2013
New Revision: 1487980

URL: http://svn.apache.org/r1487980
Log:
HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1487980r1=1487979r2=1487980view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu May 
30 19:09:26 2013
@@ -737,6 +737,8 @@ Release 2.0.5-beta - UNRELEASED
 
 HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
 
+HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
+
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java?rev=1487980r1=1487979r2=1487980view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
 Thu May 30 19:09:26 2013
@@ -18,7 +18,7 @@
 package org.apache.hadoop.test;
 
 import org.junit.Rule;
-import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
 import org.junit.rules.Timeout;
 
 /**
@@ -30,5 +30,5 @@ import org.junit.rules.Timeout;
 public class UnitTestcaseTimeLimit {
   public final int timeOutSecs = 10;
   
-  @Rule public MethodRule globalTimeout = new Timeout(timeOutSecs * 1000);
+  @Rule public TestRule globalTimeout = new Timeout(timeOutSecs * 1000);
 }

svn commit: r1487980 - /hadoop/common/trunk/hadoop-project/pom.xml

[cos]

Author: cos
Date: Thu May 30 19:09:26 2013
New Revision: 1487980

URL: http://svn.apache.org/r1487980
Log:
HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.

Modified:
hadoop/common/trunk/hadoop-project/pom.xml

Modified: hadoop/common/trunk/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1487980r1=1487979r2=1487980view=diff
==
--- hadoop/common/trunk/hadoop-project/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project/pom.xml Thu May 30 19:09:26 2013
@@ -520,7 +520,7 @@
   dependency
 groupIdjunit/groupId
 artifactIdjunit/artifactId
-version4.8.2/version
+version4.10/version
   /dependency
   dependency
 groupIdcommons-lang/groupId

svn commit: r1487981 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java

[cos]

Author: cos
Date: Thu May 30 19:13:12 2013
New Revision: 1487981

URL: http://svn.apache.org/r1487981
Log:
HADOOP-9607. Fixes in Javadoc build. Contributed by Timothy St. Clair

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1487981r1=1487980r2=1487981view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Thu May 30 19:13:12 2013
@@ -373,6 +373,8 @@ Release 2.0.5-beta - UNRELEASED
 
 HADOOP-9397. Incremental dist tar build fails. (Chris Nauroth via jlowe)
 
+HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
+
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java?rev=1487981r1=1487980r2=1487981view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
 Thu May 30 19:13:12 2013
@@ -28,7 +28,7 @@ import org.apache.hadoop.metrics2.Metric
  */
 @InterfaceAudience.Private
 public enum JvmMetricsInfo implements MetricsInfo {
-  JvmMetrics(JVM related metrics etc.), // record infoß
+  JvmMetrics(JVM related metrics etc.), // record info
   // metrics
   MemNonHeapUsedM(Non-heap memory used in MB),
   MemNonHeapCommittedM(Non-heap memory committed in MB),

svn commit: r1487979 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java

[cos]

Author: cos
Date: Thu May 30 19:06:49 2013
New Revision: 1487979

URL: http://svn.apache.org/r1487979
Log:
HADOOP-9607. Fixes in Javadoc build. Contributed by Timothy St. Clair

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1487979r1=1487978r2=1487979view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu May 
30 19:06:49 2013
@@ -735,6 +735,8 @@ Release 2.0.5-beta - UNRELEASED
 HADOOP-9553. TestAuthenticationToken fails on Windows.
 (Arpit Agarwal via suresh)
 
+HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
+
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java?rev=1487979r1=1487978r2=1487979view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
 Thu May 30 19:06:49 2013
@@ -28,7 +28,7 @@ import org.apache.hadoop.metrics2.Metric
  */
 @InterfaceAudience.Private
 public enum JvmMetricsInfo implements MetricsInfo {
-  JvmMetrics(JVM related metrics etc.), // record infoß
+  JvmMetrics(JVM related metrics etc.), // record info
   // metrics
   MemNonHeapUsedM(Non-heap memory used in MB),
   MemNonHeapCommittedM(Non-heap memory committed in MB),

svn commit: r1487982 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java

[cos]

Author: cos
Date: Thu May 30 19:14:26 2013
New Revision: 1487982

URL: http://svn.apache.org/r1487982
Log:
HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1487982r1=1487981r2=1487982view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Thu May 30 19:14:26 2013
@@ -375,6 +375,8 @@ Release 2.0.5-beta - UNRELEASED
 
 HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
 
+HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
+
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java?rev=1487982r1=1487981r2=1487982view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
 Thu May 30 19:14:26 2013
@@ -18,7 +18,7 @@
 package org.apache.hadoop.test;
 
 import org.junit.Rule;
-import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
 import org.junit.rules.Timeout;
 
 /**
@@ -30,5 +30,5 @@ import org.junit.rules.Timeout;
 public class UnitTestcaseTimeLimit {
   public final int timeOutSecs = 10;
   
-  @Rule public MethodRule globalTimeout = new Timeout(timeOutSecs * 1000);
+  @Rule public TestRule globalTimeout = new Timeout(timeOutSecs * 1000);
 }

svn commit: r1487982 - /hadoop/common/branches/branch-2/hadoop-project/pom.xml

[cos]

Author: cos
Date: Thu May 30 19:14:26 2013
New Revision: 1487982

URL: http://svn.apache.org/r1487982
Log:
HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.

Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml

Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1487982r1=1487981r2=1487982view=diff
==
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Thu May 30 19:14:26 
2013
@@ -519,7 +519,7 @@
   dependency
 groupIdjunit/groupId
 artifactIdjunit/artifactId
-version4.8.2/version
+version4.10/version
   /dependency
   dependency
 groupIdcommons-lang/groupId

svn commit: r1486204 - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Fri May 24 20:04:35 2013
New Revision: 1486204

URL: http://svn.apache.org/r1486204
Log:
HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing build 
issues. Contributed by Sangjin Lee.

Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1486204r1=1486203r2=1486204view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Fri May 24 20:04:35 2013
@@ -1,6 +1,24 @@
 Hadoop Change Log
 
-Release 2.0.4-alpha - UNRELEASED
+Release 2.0.4.1-alpha - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+  MAPREDUCE-5240 inside of FileOutputCommitter the initialized Credentials 
cache
+  appears to be empty. (vinodkv)
+
+  HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing
+  build issues. (Sangjin Lee via suresh)
+
+Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES
 

svn commit: r1486204 - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-project/pom.xml

[cos]

Author: cos
Date: Fri May 24 20:04:35 2013
New Revision: 1486204

URL: http://svn.apache.org/r1486204
Log:
HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing build 
issues. Contributed by Sangjin Lee.

Modified:
hadoop/common/branches/branch-2.0.4-alpha/hadoop-project/pom.xml

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-project/pom.xml?rev=1486204r1=1486203r2=1486204view=diff
==
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-project/pom.xml Fri May 24 
20:04:35 2013
@@ -46,7 +46,7 @@
 
 hadoop.assemblies.version${project.version}/hadoop.assemblies.version
 
-commons-daemon.version1.0.3/commons-daemon.version
+commons-daemon.version1.0.13/commons-daemon.version
 
 test.build.dir${project.build.directory}/test-dir/test.build.dir
 test.build.data${test.build.dir}/test.build.data

svn commit: r1486270 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Sat May 25 01:43:46 2013
New Revision: 1486270

URL: http://svn.apache.org/r1486270
Log:
Updating common and mapreduce CHANGES.txt with 2.0.4.1-alpha release

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1486270r1=1486269r2=1486270view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Sat May 25 01:43:46 2013
@@ -367,7 +367,22 @@ Release 2.0.5-beta - UNRELEASED
 HADOOP-9553. TestAuthenticationToken fails on Windows.
 (Arpit Agarwal via suresh)
 
-Release 2.0.4-beta - UNRELEASED
+Release 2.0.4.1-alpha - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+  HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing
+  build issues. (Sangjin Lee via suresh)
+
+Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES
 

svn commit: r1486272 - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Sat May 25 01:46:41 2013
New Revision: 1486272

URL: http://svn.apache.org/r1486272
Log:
Fixing CHANGES.txt before release

Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1486272r1=1486271r2=1486272view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Sat May 25 01:46:41 2013
@@ -12,9 +12,6 @@ Release 2.0.4.1-alpha - UNRELEASED
 
   BUG FIXES
 
-  MAPREDUCE-5240 inside of FileOutputCommitter the initialized Credentials 
cache
-  appears to be empty. (vinodkv)
-
   HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing
   build issues. (Sangjin Lee via suresh)
 

svn commit: r1486273 - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

[cos]

Author: cos
Date: Sat May 25 01:46:44 2013
New Revision: 1486273

URL: http://svn.apache.org/r1486273
Log:
Updating releasenotes.html for 2.0.4.1 release

Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html?rev=1486273r1=1486272r2=1486273view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html
 Sat May 25 01:46:44 2013
@@ -6,7 +6,21 @@
TABLE {margin-left: 7mm}
 /STYLE
 /head
-body
+bodyhtml
+h1Hadoop  2.0.4.1-alpha Release Notes/h1
+These release notes include new developer and user-facing incompatibilities, 
features, and major improvements. 
+a name=changes/
+h2Changes since Hadoop 2.0.4-alpha/h2
+ul
+li a 
href='https://issues.apache.org/jira/browse/HADOOP-9407'HADOOP-9407/a.
+ commons-daemon 1.0.3 dependency has bad group id causing build issues/br
+ blockquoteCommitted to branch-2.0.4.1 Modified changes.txt in trunk, 
branch-2 and branch-2.0.4 accordingly./blockquote/li
+li a 
href='https://issues.apache.org/jira/browse/MAPREDUCE-5240'MAPREDUCE-5240/a.
+ inside of FileOutputCommitter the initialized Credentials cache appears 
to be empty/br
+ blockquoteCommitted to branch-2.0.4.1 Modified changes.txt in trunk, 
branch-2 and branch-2.0.4 accordingly./blockquote/li
+/li
+/ul
+/body/html
 h1Hadoop  2.0.4-alpha Release Notes/h1
 These release notes include new developer and user-facing incompatibilities, 
features, and major improvements. 
 a name=changes/

svn commit: r1486278 - in /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project: hadoop-annotations/pom.xml hadoop-auth-examples/pom.xml hadoop-auth/pom.xml hadoop-common/pom.xml pom.xml

[cos]

Author: cos
Date: Sat May 25 02:40:27 2013
New Revision: 1486278

URL: http://svn.apache.org/r1486278
Log:
Preparing release 2.0.4.1-alpha

Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/pom.xml

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml?rev=1486278r1=1486277r2=1486278view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml
 Sat May 25 02:40:27 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4.1-SNAPSHOT/version
+version2.0.4.1-alpha/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-annotations/artifactId
-  version2.0.4.1-SNAPSHOT/version
+  version2.0.4.1-alpha/version
   descriptionApache Hadoop Annotations/description
   nameApache Hadoop Annotations/name
   packagingjar/packaging

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1486278r1=1486277r2=1486278view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
 Sat May 25 02:40:27 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4.1-SNAPSHOT/version
+version2.0.4.1-alpha/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth-examples/artifactId
-  version2.0.4.1-SNAPSHOT/version
+  version2.0.4.1-alpha/version
   packagingwar/packaging
 
   nameApache Hadoop Auth Examples/name

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml?rev=1486278r1=1486277r2=1486278view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml
 Sat May 25 02:40:27 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4.1-SNAPSHOT/version
+version2.0.4.1-alpha/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth/artifactId
-  version2.0.4.1-SNAPSHOT/version
+  version2.0.4.1-alpha/version
   packagingjar/packaging
 
   nameApache Hadoop Auth/name

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml?rev=1486278r1=1486277r2=1486278view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml
 Sat May 25 02:40:27 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.4.1-SNAPSHOT/version
+version2.0.4.1-alpha/version
 relativePath../../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-common/artifactId
-  version2.0.4.1-SNAPSHOT/version
+  version2.0.4.1-alpha/version
   descriptionApache Hadoop Common/description
   nameApache Hadoop Common/name
   packagingjar/packaging

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/pom.xml?rev=1486278r1=1486277r2

svn commit: r1486278 - in /hadoop/common/branches/branch-2.0.4-alpha: ./ hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-maven-plugins/ hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ h

[cos]

Author: cos
Date: Sat May 25 02:40:27 2013
New Revision: 1486278

URL: http://svn.apache.org/r1486278
Log:
Preparing release 2.0.4.1-alpha

Modified:
hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-minicluster/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-project-dist/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-project/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-archives/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-extras/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-gridmix/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-rumen/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/pom.xml

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml?rev=1486278r1=1486277r2=1486278view=diff
==
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml Sat May 
25 02:40:27 2013
@@ -23,12 +23,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4.1-SNAPSHOT/version
+version2.0.4.1-alpha/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-assemblies/artifactId
-  version2.0.4.1-SNAPSHOT/version
+  version2.0.4.1-alpha/version
   nameApache Hadoop Assemblies/name
   descriptionApache Hadoop Assemblies/description
 

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml?rev=1486278r1=1486277r2=1486278view=diff
==
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml Sat May 25 
02:40:27 2013
@@ -18,12 +18,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.4.1-SNAPSHOT/version
+version2.0.4.1-alpha/version
 relativePath../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-client/artifactId
-  version2.0.4.1-SNAPSHOT/version
+  version2.0.4.1-alpha/version
   packagingjar/packaging
 
   descriptionApache Hadoop Client/description

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml?rev=1486278r1=1486277r2=1486278view=diff
==
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml Sat May 25 
02:40:27 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4.1-SNAPSHOT/version
+version2.0.4.1-alpha/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-dist/artifactId
-  version2.0.4.1-SNAPSHOT/version
+  version2.0.4.1-alpha/version
   descriptionApache Hadoop Distribution/description
   nameApache Hadoop Distribution/name
   packagingjar/packaging

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml?rev=1486278r1=1486277r2=1486278view=diff
==
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml Sat 
May 25 02:40:27 2013
@@ -19,7 +19,7 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4.1-SNAPSHOT/version

svn commit: r1486281 - /hadoop/common/tags/release-2.0.4.1-alpha-rc0/

[cos]

Author: cos
Date: Sat May 25 03:15:12 2013
New Revision: 1486281

URL: http://svn.apache.org/r1486281
Log:
Tagging 2.0.4.1-alpha-rc0 release

Added:
hadoop/common/tags/release-2.0.4.1-alpha-rc0/   (props changed)
  - copied from r1486278, hadoop/common/branches/branch-2.0.4-alpha/

Propchange: hadoop/common/tags/release-2.0.4.1-alpha-rc0/
--
--- svn:ignore (added)
+++ svn:ignore Sat May 25 03:15:12 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target

Propchange: hadoop/common/tags/release-2.0.4.1-alpha-rc0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat May 25 03:15:12 2013
@@ -0,0 +1,3 @@
+/hadoop/common/branches/HDFS-3042:1306184-1342109
+/hadoop/common/branches/branch-0.23-PB:1227776-1294021
+/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624,
 
1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121

svn commit: r1484569 [1/2] - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

[cos]

Author: cos
Date: Mon May 20 19:32:48 2013
New Revision: 1484569

URL: http://svn.apache.org/r1484569
Log:
Replacing CRLF's in the releasenotes.html file with LF's (the file seems to be 
corrupted during auto-generation)

Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html

svn commit: r1484571 - in /hadoop/common/branches/branch-2.0.4-alpha: ./ hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-maven-plugins/ hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ h

[cos]

Author: cos
Date: Mon May 20 19:32:57 2013
New Revision: 1484571

URL: http://svn.apache.org/r1484571
Log:
Setting the version to 2.0.4.1-SNAPSHOT

Modified:
hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-minicluster/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-project-dist/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-project/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-archives/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-extras/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-gridmix/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-rumen/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-streaming/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/pom.xml

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml?rev=1484571r1=1484570r2=1484571view=diff
==
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-assemblies/pom.xml Mon May 
20 19:32:57 2013
@@ -23,12 +23,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.4.1-SNAPSHOT/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-assemblies/artifactId
-  version2.0.4-alpha/version
+  version2.0.4.1-SNAPSHOT/version
   nameApache Hadoop Assemblies/name
   descriptionApache Hadoop Assemblies/description
 

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml?rev=1484571r1=1484570r2=1484571view=diff
==
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-client/pom.xml Mon May 20 
19:32:57 2013
@@ -18,12 +18,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.4-alpha/version
+version2.0.4.1-SNAPSHOT/version
 relativePath../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-client/artifactId
-  version2.0.4-alpha/version
+  version2.0.4.1-SNAPSHOT/version
   packagingjar/packaging
 
   descriptionApache Hadoop Client/description

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml?rev=1484571r1=1484570r2=1484571view=diff
==
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-dist/pom.xml Mon May 20 
19:32:57 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.4.1-SNAPSHOT/version
 relativePath../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-dist/artifactId
-  version2.0.4-alpha/version
+  version2.0.4.1-SNAPSHOT/version
   descriptionApache Hadoop Distribution/description
   nameApache Hadoop Distribution/name
   packagingjar/packaging

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml?rev=1484571r1=1484570r2=1484571view=diff
==
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml 
(original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/pom.xml Mon 
May 20 19:32:57 2013
@@ -19,7 +19,7 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version

svn commit: r1484571 - in /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project: hadoop-annotations/pom.xml hadoop-auth-examples/pom.xml hadoop-auth/pom.xml hadoop-common/pom.xml pom.xml

[cos]

Author: cos
Date: Mon May 20 19:32:57 2013
New Revision: 1484571

URL: http://svn.apache.org/r1484571
Log:
Setting the version to 2.0.4.1-SNAPSHOT

Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/pom.xml

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml?rev=1484571r1=1484570r2=1484571view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-annotations/pom.xml
 Mon May 20 19:32:57 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.4.1-SNAPSHOT/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-annotations/artifactId
-  version2.0.4-alpha/version
+  version2.0.4.1-SNAPSHOT/version
   descriptionApache Hadoop Annotations/description
   nameApache Hadoop Annotations/name
   packagingjar/packaging

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1484571r1=1484570r2=1484571view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth-examples/pom.xml
 Mon May 20 19:32:57 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.4.1-SNAPSHOT/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth-examples/artifactId
-  version2.0.4-alpha/version
+  version2.0.4.1-SNAPSHOT/version
   packagingwar/packaging
 
   nameApache Hadoop Auth Examples/name

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml?rev=1484571r1=1484570r2=1484571view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/pom.xml
 Mon May 20 19:32:57 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project/artifactId
-version2.0.4-alpha/version
+version2.0.4.1-SNAPSHOT/version
 relativePath../../hadoop-project/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-auth/artifactId
-  version2.0.4-alpha/version
+  version2.0.4.1-SNAPSHOT/version
   packagingjar/packaging
 
   nameApache Hadoop Auth/name

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml?rev=1484571r1=1484570r2=1484571view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/pom.xml
 Mon May 20 19:32:57 2013
@@ -20,12 +20,12 @@
   parent
 groupIdorg.apache.hadoop/groupId
 artifactIdhadoop-project-dist/artifactId
-version2.0.4-alpha/version
+version2.0.4.1-SNAPSHOT/version
 relativePath../../hadoop-project-dist/relativePath
   /parent
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-common/artifactId
-  version2.0.4-alpha/version
+  version2.0.4.1-SNAPSHOT/version
   descriptionApache Hadoop Common/description
   nameApache Hadoop Common/name
   packagingjar/packaging

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/pom.xml?rev=1484571r1=1484570r2=1484571view

svn commit: r1465309 - /hadoop/common/branches/branch-2.0.4-alpha/

[cos]

Author: cos
Date: Sat Apr  6 22:44:19 2013
New Revision: 1465309

URL: http://svn.apache.org/r1465309
Log:
svn merge -c1455316 from trunk

HADOOP-9379. capture the ulimit info after printing the log to the console. 
(Arpit Gupta via suresh)


Modified:
hadoop/common/branches/branch-2.0.4-alpha/   (props changed)

Propchange: hadoop/common/branches/branch-2.0.4-alpha/
--
  Merged /hadoop/common/trunk:r1455316

svn commit: r1465309 - in /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project: ./ hadoop-common/ hadoop-common/CHANGES.txt hadoop-common/src/main/bin/hadoop-daemon.sh

[cos]

Author: cos
Date: Sat Apr  6 22:44:19 2013
New Revision: 1465309

URL: http://svn.apache.org/r1465309
Log:
svn merge -c1455316 from trunk

HADOOP-9379. capture the ulimit info after printing the log to the console. 
(Arpit Gupta via suresh)


Modified:
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/   (props 
changed)

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/  
 (props changed)

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
   (contents, props changed)

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh

Propchange: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/
--
  Merged /hadoop/common/trunk/hadoop-common-project:r1455316

Propchange: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/
--
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1455316

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1465309r1=1465308r2=1465309view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Sat Apr  6 22:44:19 2013
@@ -98,6 +98,9 @@ Release 2.0.4-alpha - UNRELEASED
 HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken.
 (Andrew Wang via atm)
 
+HADOOP-9379. capture the ulimit info after printing the log to the 
+console. (Arpit Gupta via suresh)
+
 Release 2.0.3-alpha - 2013-02-06 
 
   INCOMPATIBLE CHANGES

Propchange: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
--
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1455316

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh?rev=1465309r1=1465308r2=1465309view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
 Sat Apr  6 22:44:19 2013
@@ -156,6 +156,7 @@ case $startStop in
 esac
 echo $!  $pid
 sleep 1
+head $log
 # capture the ulimit output
 if [ true = $starting_secure_dn ]; then
   echo ulimit -a for secure datanode user $HADOOP_SECURE_DN_USER  $log
@@ -165,7 +166,6 @@ case $startStop in
   echo ulimit -a for user $USER  $log
   ulimit -a  $log 21
 fi
-head -30 $log
 sleep 3;
 if ! ps -p $!  /dev/null ; then
   exit 1

svn commit: r1465123 - /hadoop/common/branches/branch-2/

[cos]

Author: cos
Date: Fri Apr  5 20:45:13 2013
New Revision: 1465123

URL: http://svn.apache.org/r1465123
Log:
svn merge -c1465121

HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value.
Contributed by Jagane Sundar

Modified:
hadoop/common/branches/branch-2/   (props changed)

Propchange: hadoop/common/branches/branch-2/
--
  Merged /hadoop/common/trunk:r1465121

svn commit: r1465124 - /hadoop/common/branches/branch-2.0.4-alpha/

[cos]

Author: cos
Date: Fri Apr  5 20:49:34 2013
New Revision: 1465124

URL: http://svn.apache.org/r1465124
Log:
svn merge -c1465121 from trunk

HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value. 
Contributed by Jagane Sundar


Modified:
hadoop/common/branches/branch-2.0.4-alpha/   (props changed)

Propchange: hadoop/common/branches/branch-2.0.4-alpha/
--
  Merged /hadoop/common/trunk:r1465121

svn commit: r1464147 - /hadoop/common/branches/branch-2/

[cos]

Author: cos
Date: Wed Apr  3 18:35:31 2013
New Revision: 1464147

URL: http://svn.apache.org/r1464147
Log:
MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is 
submitting a job (daryn)

Modified:
hadoop/common/branches/branch-2/   (props changed)

Propchange: hadoop/common/branches/branch-2/
--
  Merged /hadoop/common/branches/branch-2.0.4-alpha:r1463804

svn commit: r1464153 - /hadoop/common/trunk/

[cos]

Author: cos
Date: Wed Apr  3 18:45:15 2013
New Revision: 1464153

URL: http://svn.apache.org/r1464153
Log:
MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is 
submitting a job (daryn)

merge -c1463804 from branch-2.0.4-alpha


Modified:
hadoop/common/trunk/   (props changed)

Propchange: hadoop/common/trunk/
--
  Merged /hadoop/common/branches/branch-2.0.4-alpha:r1463804

svn commit: r1463292 - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java

[cos]

Author: cos
Date: Mon Apr  1 20:30:03 2013
New Revision: 1463292

URL: http://svn.apache.org/r1463292
Log:
Backport of
HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken


Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java?rev=1463292r1=1463291r2=1463292view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java
 Mon Apr  1 20:30:03 2013
@@ -247,7 +247,7 @@ public class TestGridmixSummary {
  qPath.toString(), es.getInputTraceLocation());
 // test expected data size
 assertEquals(Mismatch in expected data size, 
- 1.0k, es.getExpectedDataSize());
+ 1 K, es.getExpectedDataSize());
 // test input data statistics
 assertEquals(Mismatch in input data statistics, 
  ExecutionSummarizer.stringifyDataStatistics(dataStats), 
@@ -262,7 +262,7 @@ public class TestGridmixSummary {
 es.finalize(factory, testTraceFile.toString(), 1024*1024*1024*10L, 
resolver,
 dataStats, conf);
 assertEquals(Mismatch in expected data size, 
- 10.0g, es.getExpectedDataSize());
+ 10 G, es.getExpectedDataSize());
 
 // test trace signature uniqueness
 //  touch the trace file
@@ -374,4 +374,4 @@ public class TestGridmixSummary {
 assertEquals(Cluster summary test failed!, 0, 
  cs.getNumBlacklistedTrackers());
   }
-}
\ No newline at end of file
+}

svn commit: r1463292 - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Mon Apr  1 20:30:03 2013
New Revision: 1463292

URL: http://svn.apache.org/r1463292
Log:
Backport of
HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken


Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1463292r1=1463291r2=1463292view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Mon Apr  1 20:30:03 2013
@@ -95,6 +95,9 @@ Release 2.0.4-alpha - UNRELEASED
 HADOOP-9444. Modify hadoop-policy.xml to replace unexpanded variables to a
 default value of '*'. (Roman Shaposhnik via vinodkv)
 
+HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken.
+(Andrew Wang via atm)
+
 Release 2.0.3-alpha - 2013-02-06 
 
   INCOMPATIBLE CHANGES

svn commit: r1459995 - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java

[cos]

Author: cos
Date: Fri Mar 22 21:21:45 2013
New Revision: 1459995

URL: http://svn.apache.org/r1459995
Log:
HADOOP-9399. protoc maven plugin doesn't work on mvn 3.0.2 (todd)


Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java?rev=1459995r1=1459994r2=1459995view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
 Fri Mar 22 21:21:45 2013
@@ -37,7 +37,7 @@ public class ProtocMojo extends Abstract
   private MavenProject project;
 
   @Parameter
-  private ListFile imports;
+  private File[] imports;
 
   @Parameter(defaultValue=${project.build.directory}/generated-sources/java)
   private File output;
@@ -83,4 +83,4 @@ public class ProtocMojo extends Abstract
 project.addCompileSourceRoot(output.getAbsolutePath());
   }
 
-}
\ No newline at end of file
+}

svn commit: r1459995 - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Fri Mar 22 21:21:45 2013
New Revision: 1459995

URL: http://svn.apache.org/r1459995
Log:
HADOOP-9399. protoc maven plugin doesn't work on mvn 3.0.2 (todd)


Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1459995r1=1459994r2=1459995view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Fri Mar 22 21:21:45 2013
@@ -90,6 +90,8 @@ Release 2.0.4-alpha - UNRELEASED
 HADOOP-9299.  kerberos name resolution is kicking in even when kerberos
 is not configured (daryn)
 
+HADOOP-9399. protoc maven plugin doesn't work on mvn 3.0.2 (todd)
+
 Release 2.0.3-alpha - 2013-02-06 
 
   INCOMPATIBLE CHANGES

svn commit: r1457975 - in /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project: hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ hadoop-common/src/main/java/org/ap

[cos]

Author: cos
Date: Mon Mar 18 20:28:53 2013
New Revision: 1457975

URL: http://svn.apache.org/r1457975
Log:
HADOOP-9299. kerberos name resolution is kicking in even when kerberos is not 
configured (daryn)

Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java?rev=1457975r1=1457974r2=1457975view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
 Mon Mar 18 20:28:53 2013
@@ -383,10 +383,26 @@ public class KerberosName {
* @param ruleString the rules string.
*/
   public static void setRules(String ruleString) {
-rules = parseRules(ruleString);
+rules = (ruleString != null) ? parseRules(ruleString) : null;
   }
 
   /**
+   * Get the rules.
+   * @return String of configured rules, or null if not yet configured
+   */
+  public static String getRules() {
+String ruleString = null;
+if (rules != null) {
+  StringBuilder sb = new StringBuilder();
+  for (Rule rule : rules) {
+sb.append(rule.toString()).append(\n);
+  }
+  ruleString = sb.toString().trim();
+}
+return ruleString;
+  }
+  
+  /**
* Indicates if the name rules have been set.
* 
* @return if the name rules have been set.

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java?rev=1457975r1=1457974r2=1457975view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java
 Mon Mar 18 20:28:53 2013
@@ -18,6 +18,8 @@
 
 package org.apache.hadoop.security;
 
+import static 
org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTH_TO_LOCAL;
+
 import java.io.IOException;
 
 import org.apache.hadoop.classification.InterfaceAudience;
@@ -25,7 +27,6 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.authentication.util.KerberosName;
 import org.apache.hadoop.security.authentication.util.KerberosUtil;
-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 /**
  * This class implements parsing and handling of Kerberos principal names. In 
  * particular, it splits them apart and translates them down into local
@@ -36,15 +37,6 @@ import org.apache.hadoop.fs.CommonConfig
 @InterfaceStability.Evolving
 public class HadoopKerberosName extends KerberosName {
 
-  static {
-try {
-  KerberosUtil.getDefaultRealm();
-} catch (Exception ke) {
-  if(UserGroupInformation.isSecurityEnabled())
-throw new IllegalArgumentException(Can't get Kerberos 
configuration,ke);
-}
-  }
-
   /**
* Create a name from the full Kerberos principal name.
* @param name
@@ -63,7 +55,23 @@ public class HadoopKerberosName extends 
* @throws IOException
*/
   public static void setConfiguration(Configuration conf) throws IOException {
-String ruleString = 
conf.get(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTH_TO_LOCAL, 
DEFAULT);
+final String defaultRule;
+switch (SecurityUtil.getAuthenticationMethod(conf)) {
+  case KERBEROS:
+  case KERBEROS_SSL:
+try {
+  KerberosUtil.getDefaultRealm();
+} catch (Exception ke) {
+  throw new IllegalArgumentException(Can't get

svn commit: r1457976 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Mon Mar 18 20:29:28 2013
New Revision: 1457976

URL: http://svn.apache.org/r1457976
Log:
Fixing CHANGES.txt: moving HADOOP-9299 to 2.0.4-alpha

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1457976r1=1457975r2=1457976view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Mon Mar 18 20:29:28 2013
@@ -85,9 +85,6 @@ Release 2.0.5-beta - UNRELEASED
 HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing
 build issues. (Sangjin Lee via suresh)
 
-HADOOP-9299.  kerberos name resolution is kicking in even when kerberos
-is not configured (daryn)
-
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -104,6 +101,9 @@ Release 2.0.4-alpha - UNRELEASED
 
 HADOOP-9301. hadoop client servlet/jsp/jetty/tomcat JARs creating 
conflicts in Oozie  HttpFS. (tucu)
 
+HADOOP-9299.  kerberos name resolution is kicking in even when kerberos
+is not configured (daryn)
+
 Release 2.0.3-alpha - 2013-02-06 
 
   INCOMPATIBLE CHANGES

svn commit: r1457977 - /hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

[cos]

Author: cos
Date: Mon Mar 18 20:31:31 2013
New Revision: 1457977

URL: http://svn.apache.org/r1457977
Log:
Fixing CHANGES.txt after HADOOP-9299 was backported (cos)

Modified:

hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1457977r1=1457976r2=1457977view=diff
==
--- 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Mon Mar 18 20:31:31 2013
@@ -87,6 +87,9 @@ Release 2.0.4-alpha - UNRELEASED
 
 HADOOP-9301. hadoop client servlet/jsp/jetty/tomcat JARs creating 
conflicts in Oozie  HttpFS. (tucu)
 
+HADOOP-9299.  kerberos name resolution is kicking in even when kerberos
+is not configured (daryn)
+
 Release 2.0.3-alpha - 2013-02-06 
 
   INCOMPATIBLE CHANGES

svn commit: r1431878 - in /hadoop/common/site: common/author/src/documentation/content/xdocs/ common/publish/ hdfs/author/src/documentation/content/xdocs/ hdfs/publish/ main/author/src/documentation/c

[cos]

Author: cos
Date: Fri Jan 11 04:46:36 2013
New Revision: 1431878

URL: http://svn.apache.org/viewvc?rev=1431878view=rev
Log:
Change Committers affiliation for cos

Modified:
hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml
hadoop/common/site/common/publish/credits.html
hadoop/common/site/common/publish/credits.pdf
hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml
hadoop/common/site/hdfs/publish/credits.html
hadoop/common/site/hdfs/publish/credits.pdf
hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml
hadoop/common/site/main/publish/who.html
hadoop/common/site/main/publish/who.pdf

hadoop/common/site/mapreduce/author/src/documentation/content/xdocs/credits.xml
hadoop/common/site/mapreduce/publish/credits.html
hadoop/common/site/mapreduce/publish/credits.pdf

Modified: 
hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml?rev=1431878r1=1431877r2=1431878view=diff
==
--- 
hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml 
(original)
+++ 
hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml 
Fri Jan 11 04:46:36 2013
@@ -101,7 +101,7 @@
   tr
 tdcos/td
 tda href=http://people.apache.org/~cos;Konstantin Boudnik/a/td
-tdKarmasphere/td
+tdWANdisco/td
 td/td
 td-8/td
   /tr

Modified: hadoop/common/site/common/publish/credits.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/common/publish/credits.html?rev=1431878r1=1431877r2=1431878view=diff
==
--- hadoop/common/site/common/publish/credits.html (original)
+++ hadoop/common/site/common/publish/credits.html Fri Jan 11 04:46:36 2013
@@ -3,7 +3,7 @@
 head
 META http-equiv=Content-Type content=text/html; charset=UTF-8
 meta content=Apache Forrest name=Generator
-meta name=Forrest-version content=0.9
+meta name=Forrest-version content=0.8
 meta name=Forrest-skin-name content=hadoop-pelt
 titleHadoop Common Credits/title
 link type=text/css href=skin/basic.css rel=stylesheet
@@ -214,7 +214,7 @@ document.write(Last Published:  + docu
 /div
 
 
-a name=N1000D/aa name=Committers/a
+a name=N1000C/aa name=Committers/a
 h2 class=h3Committers/h2
 div class=section
 pHadoop Common active committers include:/p
@@ -335,7 +335,7 @@ document.write(Last Published:  + docu
 
 td colspan=1 rowspan=1cos/td
 td colspan=1 rowspan=1a 
href=http://people.apache.org/~cos;Konstantin Boudnik/a/td
-td colspan=1 rowspan=1Karmasphere/td
+td colspan=1 rowspan=1WANdisco/td
 td colspan=1 rowspan=1/td
 td colspan=1 rowspan=1-8/td
   
@@ -831,16 +831,16 @@ document.write(Last Published:  + docu
 /div
 
 
-a name=N10644/aa name=Contributors/a
+a name=N10643/aa name=Contributors/a
 h2 class=h3Contributors/h2
 div class=section
 pHadoop Common contributors and their contributions are listed at Apache 
-a 
href=https://issues.apache.org/jira/secure/ConfigureReport.jspa?versionId=-2amp;selectedProjectId=12310240amp;reportKey=com.sourcelabs.jira.plugin.report.contributions%3Acontributionreportamp;Next=Next;JIRA/a.
+a 
href=https://issues.apache.org/jira/secure/ConfigureReport.jspa?versionId=-2selectedProjectId=12310240reportKey=com.sourcelabs.jira.plugin.report.contributions%3AcontributionreportNext=Next;JIRA/a.
 /p
 /div
 
 
-a name=N10652/aa name=Emeriti/a
+a name=N10651/aa name=Emeriti/a
 h2 class=h3Emeriti/h2
 div class=section
 pHadoop Common committers who are no longer active include:/p

Modified: hadoop/common/site/common/publish/credits.pdf
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/common/publish/credits.pdf?rev=1431878r1=1431877r2=1431878view=diff
==
Binary files - no diff available.

Modified: 
hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml?rev=1431878r1=1431877r2=1431878view=diff
==
--- hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml 
(original)
+++ hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml 
Fri Jan 11 04:46:36 2013
@@ -69,7 +69,7 @@
   tr
 tdcos/td
 tda href=http://people.apache.org/~cos;Konstantin Boudnik/a/td
-tdKarmasphere/td
+tdWANdisco/td
 td/td
 td-8/td
   /tr

Modified: hadoop/common/site/hdfs/publish/credits.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/hdfs/publish/credits.html?rev=1431878r1=1431877r2=1431878view=diff

svn commit: r1358689 - in /hadoop/common/branches/branch-1.1: CHANGES.txt ivy/hadoop-core-pom-template.xml

[cos]

Author: cos
Date: Sun Jul  8 03:29:42 2012
New Revision: 1358689

URL: http://svn.apache.org/viewvc?rev=1358689view=rev
Log:
HADOOP-8417. HADOOP-6963 didn't update hadoop-core-pom-template.xml. 
Contributed by Zhihong Ted Yu.

Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1358689r1=1358688r2=1358689view=diff
==
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Sun Jul  8 03:29:42 2012
@@ -268,6 +268,8 @@ Release 1.1.0 - unreleased
 HDFS-6527. Backport HADOOP-7389: Use of TestingGroups by tests causes
 subsequent tests to fail.  (Ivan Mitic via szetszwo)
 
+HDFS-8417. HADOOP-6963 didn't update hadoop-core-pom-template.xml (Zhihong 
Ted Yu via cos)
+
 Release 1.0.3 - 2012.05.07
 
   NEW FEATURES

Modified: hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml?rev=1358689r1=1358688r2=1358689view=diff
==
--- hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml 
(original)
+++ hadoop/common/branches/branch-1.1/ivy/hadoop-core-pom-template.xml Sun Jul  
8 03:29:42 2012
@@ -34,6 +34,11 @@
   version0.52/version
 /dependency
 dependency
+  groupIdcommons-io/groupId
+  artifactIdcommons-io/artifactId
+  version2.1/version
+/dependency
+dependency
   groupIdcommons-httpclient/groupId
   artifactIdcommons-httpclient/artifactId
   version3.0.1/version

svn commit: r1358690 - in /hadoop/common/branches/branch-1: ./ CHANGES.txt ivy/hadoop-core-pom-template.xml src/mapred/

[cos]

Author: cos
Date: Sun Jul  8 03:45:40 2012
New Revision: 1358690

URL: http://svn.apache.org/viewvc?rev=1358690view=rev
Log:
svn merge -c 1358689 from branch-1.1 backporting HADOOP-8417.

Modified:
hadoop/common/branches/branch-1/   (props changed)
hadoop/common/branches/branch-1/CHANGES.txt   (contents, props changed)
hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml
hadoop/common/branches/branch-1/src/mapred/   (props changed)

Propchange: hadoop/common/branches/branch-1/
--
  Merged /hadoop/common/branches/branch-1.1:r1358689

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1358690r1=1358689r2=1358690view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Jul  8 03:45:40 2012
@@ -332,6 +332,8 @@ Release 1.1.0 - unreleased
 HDFS-6527. Backport HADOOP-7389: Use of TestingGroups by tests causes
 subsequent tests to fail.  (Ivan Mitic via szetszwo)
 
+HDFS-8417. HADOOP-6963 didn't update hadoop-core-pom-template.xml (Zhihong 
Ted Yu via cos)
+
 Release 1.0.3 - 2012.05.07
 
   NEW FEATURES

Propchange: hadoop/common/branches/branch-1/CHANGES.txt
--
  Merged /hadoop/common/branches/branch-1.1/CHANGES.txt:r1358689

Modified: hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml?rev=1358690r1=1358689r2=1358690view=diff
==
--- hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml (original)
+++ hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml Sun Jul  8 
03:45:40 2012
@@ -34,6 +34,11 @@
   version0.52/version
 /dependency
 dependency
+  groupIdcommons-io/groupId
+  artifactIdcommons-io/artifactId
+  version2.1/version
+/dependency
+dependency
   groupIdcommons-httpclient/groupId
   artifactIdcommons-httpclient/artifactId
   version3.0.1/version

Propchange: hadoop/common/branches/branch-1/src/mapred/
--
  Merged /hadoop/common/branches/branch-1.1/src/mapred:r1358689

svn commit: r1207749 - in /hadoop/common/site: common/author/src/documentation/content/xdocs/ common/publish/ hdfs/author/src/documentation/content/xdocs/ hdfs/publish/ mapreduce/author/src/documentat

[cos]

Author: cos
Date: Tue Nov 29 04:47:42 2011
New Revision: 1207749

URL: http://svn.apache.org/viewvc?rev=1207749view=rev
Log:
Fixing Cos' company name

Modified:
hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml
hadoop/common/site/common/publish/credits.html
hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml
hadoop/common/site/hdfs/publish/credits.html

hadoop/common/site/mapreduce/author/src/documentation/content/xdocs/credits.xml
hadoop/common/site/mapreduce/publish/credits.html

Modified: 
hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml?rev=1207749r1=1207748r2=1207749view=diff
==
--- 
hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml 
(original)
+++ 
hadoop/common/site/common/author/src/documentation/content/xdocs/credits.xml 
Tue Nov 29 04:47:42 2011
@@ -93,7 +93,7 @@
   tr
 tdcos/td
 tda href=http://people.apache.org/~cos;Konstantin Boudnik/a/td
-tdCloudera/td
+tdKarmasphere/td
 td/td
 td-8/td
   /tr

Modified: hadoop/common/site/common/publish/credits.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/common/publish/credits.html?rev=1207749r1=1207748r2=1207749view=diff
==
--- hadoop/common/site/common/publish/credits.html (original)
+++ hadoop/common/site/common/publish/credits.html Tue Nov 29 04:47:42 2011
@@ -307,7 +307,7 @@ document.write(Last Published:  + docu
 
 td colspan=1 rowspan=1cos/td
 td colspan=1 rowspan=1a 
href=http://people.apache.org/~cos;Konstantin Boudnik/a/td
-td colspan=1 rowspan=1Cloudera/td
+td colspan=1 rowspan=1Karmapshere/td
 td colspan=1 rowspan=1/td
 td colspan=1 rowspan=1-8/td
   

Modified: 
hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml?rev=1207749r1=1207748r2=1207749view=diff
==
--- hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml 
(original)
+++ hadoop/common/site/hdfs/author/src/documentation/content/xdocs/credits.xml 
Tue Nov 29 04:47:42 2011
@@ -69,7 +69,7 @@
   tr
 tdcos/td
 tda href=http://people.apache.org/~cos;Konstantin Boudnik/a/td
-tdCloudera/td
+tdKarmasphere/td
 td/td
 td-8/td
   /tr

Modified: hadoop/common/site/hdfs/publish/credits.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/hdfs/publish/credits.html?rev=1207749r1=1207748r2=1207749view=diff
==
--- hadoop/common/site/hdfs/publish/credits.html (original)
+++ hadoop/common/site/hdfs/publish/credits.html Tue Nov 29 04:47:42 2011
@@ -280,7 +280,7 @@ document.write(Last Published:  + docu
 
 td colspan=1 rowspan=1cos/td
 td colspan=1 rowspan=1a 
href=http://people.apache.org/~cos;Konstantin Boudnik/a/td
-td colspan=1 rowspan=1Cloudera/td
+td colspan=1 rowspan=1Karmasphere/td
 td colspan=1 rowspan=1/td
 td colspan=1 rowspan=1-8/td
   

Modified: 
hadoop/common/site/mapreduce/author/src/documentation/content/xdocs/credits.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/mapreduce/author/src/documentation/content/xdocs/credits.xml?rev=1207749r1=1207748r2=1207749view=diff
==
--- 
hadoop/common/site/mapreduce/author/src/documentation/content/xdocs/credits.xml 
(original)
+++ 
hadoop/common/site/mapreduce/author/src/documentation/content/xdocs/credits.xml 
Tue Nov 29 04:47:42 2011
@@ -61,7 +61,7 @@
   tr
 tdcos/td
 tda href=http://people.apache.org/~cos;Konstantin Boudnik/a/td
-tdCloudera/td
+tdKarmasphere/td
 td/td
 td-8/td
   /tr

Modified: hadoop/common/site/mapreduce/publish/credits.html
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/mapreduce/publish/credits.html?rev=1207749r1=1207748r2=1207749view=diff
==
--- hadoop/common/site/mapreduce/publish/credits.html (original)
+++ hadoop/common/site/mapreduce/publish/credits.html Tue Nov 29 04:47:42 2011
@@ -269,7 +269,7 @@ document.write(Last Published:  + docu
 
 td colspan=1 rowspan=1cos/td
 td colspan=1 rowspan=1a 
href=http://people.apache.org/~cos;Konstantin Boudnik/a/td
-td colspan=1 rowspan=1Cloudera/td
+td colspan=1 rowspan=1Karmasphere/td
 td colspan=1 rowspan=1/td
 td colspan=1 rowspan=1-8/td
   

svn commit: r1202497 - /hadoop/common/branches/branch-0.22/common/ivy/libraries.properties

[cos]

Author: cos
Date: Wed Nov 16 01:15:01 2011
New Revision: 1202497

URL: http://svn.apache.org/viewvc?rev=1202497view=rev
Log:
HADOOP-7450. wagon plugin version has been removed accidentally

Modified:
hadoop/common/branches/branch-0.22/common/ivy/libraries.properties

Modified: hadoop/common/branches/branch-0.22/common/ivy/libraries.properties
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy/libraries.properties?rev=1202497r1=1202496r2=1202497view=diff
==
--- hadoop/common/branches/branch-0.22/common/ivy/libraries.properties 
(original)
+++ hadoop/common/branches/branch-0.22/common/ivy/libraries.properties Wed Nov 
16 01:15:01 2011
@@ -61,6 +61,8 @@ rats-lib.version=0.6
 slf4j-api.version=1.6.1
 slf4j-log4j12.version=1.6.1
 
+wagon-http.version=1.0-beta-2
+
 xmlenc.version=0.52
 xerces.version=1.4.4
 

svn commit: r1182018 - in /hadoop/common/branches/branch-0.22/common: CHANGES.txt src/test/core/org/apache/hadoop/cli/CLITestHelper.java src/test/core/org/apache/hadoop/cli/util/CommandExecutor.java

[cos]

Author: cos
Date: Tue Oct 11 18:43:13 2011
New Revision: 1182018

URL: http://svn.apache.org/viewvc?rev=1182018view=rev
Log:
HADOOP-7730. Allow TestCLI to be run against a cluster. Contributed by Tom 
White, Konstantin Boudnik.

Modified:
hadoop/common/branches/branch-0.22/common/CHANGES.txt

hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/CLITestHelper.java

hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/util/CommandExecutor.java

Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1182018r1=1182017r2=1182018view=diff
==
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Tue Oct 11 18:43:13 
2011
@@ -549,6 +549,8 @@ Release 0.22.0 - Unreleased
 HADOOP-7697. Remove ivy dependency on different version of slf4j in avro.
 (shv)
 
+HADOOP-7730. Allow TestCLI to be run against a cluster (cos)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: 
hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/CLITestHelper.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/CLITestHelper.java?rev=1182018r1=1182017r2=1182018view=diff
==
--- 
hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/CLITestHelper.java
 (original)
+++ 
hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/CLITestHelper.java
 Tue Oct 11 18:43:13 2011
@@ -59,7 +59,9 @@ public class CLITestHelper {
   public static final String TESTMODE_NOCOMPARE = nocompare;
   public static final String TEST_CACHE_DATA_DIR =
 System.getProperty(test.cache.data, build/test/cache);
-  
+  public static final String TEST_DIR_ABSOLUTE = /tmp/testcli;
+  protected static String testDirAbsolute = TEST_DIR_ABSOLUTE;
+
   //By default, run the tests. The other mode is to run the commands and not
   // compare the output
   protected String testMode = TESTMODE_TEST;
@@ -72,7 +74,7 @@ public class CLITestHelper {
   protected Configuration conf = null;
   protected String clitestDataDir = null;
   protected String username = null;
-  
+
   /**
* Read the test config file - testConfig.xml
*/
@@ -80,10 +82,16 @@ public class CLITestHelper {
 String testConfigFile = getTestFile();
 if (testsFromConfigFile == null) {
   boolean success = false;
-  testConfigFile = TEST_CACHE_DATA_DIR + File.separator + testConfigFile;
+  String configFile = System.getProperty(test.cli.config);
+  if (configFile == null) {
+testConfigFile = TEST_CACHE_DATA_DIR + File.separator + testConfigFile;
+  } else {
+testConfigFile = configFile;
+  }
   try {
 SAXParser p = (SAXParserFactory.newInstance()).newSAXParser();
 p.parse(testConfigFile, new TestConfigFileParser());
+LOG.info(Using test config file  + testConfigFile);
 success = true;
   } catch (Exception e) {
 LOG.info(File:  + testConfigFile +  not found);
@@ -110,6 +118,8 @@ public class CLITestHelper {
 
 clitestDataDir = new File(TEST_CACHE_DATA_DIR).
 toURI().toString().replace(' ', '+');
+// Many of the tests expect a replication value of 1 in the output
+conf.setInt(dfs.replication, 1);
   }
   
   /**
@@ -128,7 +138,8 @@ public class CLITestHelper {
 String expCmd = cmd;
 expCmd = expCmd.replaceAll(CLITEST_DATA, clitestDataDir);
 expCmd = expCmd.replaceAll(USERNAME, username);
-
+expCmd = expCmd.replaceAll(TEST_DIR_ABSOLUTE, testDirAbsolute);
+
 return expCmd;
   }
   

Modified: 
hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/util/CommandExecutor.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/util/CommandExecutor.java?rev=1182018r1=1182017r2=1182018view=diff
==
--- 
hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/util/CommandExecutor.java
 (original)
+++ 
hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/cli/util/CommandExecutor.java
 Tue Oct 11 18:43:13 2011
@@ -43,6 +43,8 @@ public abstract class CommandExecutor { 
   args[i] = args[i].replaceAll(CLITEST_DATA, 
 new File(CLITestHelper.TEST_CACHE_DATA_DIR).
 toURI().toString().replace(' ', '+'));
+  args[i] = args[i].replaceAll(TEST_DIR_ABSOLUTE,
+CLITestHelper.TEST_DIR_ABSOLUTE);
   args[i] = args[i].replaceAll(USERNAME, 
System.getProperty(user.name));
 
   i++;

svn commit: r1154632 - in /hadoop/common/branches/branch-0.22/common: CHANGES.txt build.xml

[cos]

Author: cos
Date: Sun Aug  7 01:14:17 2011
New Revision: 1154632

URL: http://svn.apache.org/viewvc?rev=1154632view=rev
Log:
HADOOP-7513. mvn-deploy target fails. Contributed by Joep Rottinghuis.

Modified:
hadoop/common/branches/branch-0.22/common/CHANGES.txt
hadoop/common/branches/branch-0.22/common/build.xml

Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1154632r1=1154631r2=1154632view=diff
==
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Sun Aug  7 01:14:17 
2011
@@ -525,6 +525,8 @@ Release 0.22.0 - Unreleased
 HADOOP-7252. JUnit shows up as a compile time dependency in 0.22.
 (Harsh J Chouraria via todd)
 
+HADOOP-7513. mvn-deploy target fails (Joep Rottinghuis via cos)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/common/branches/branch-0.22/common/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/build.xml?rev=1154632r1=1154631r2=1154632view=diff
==
--- hadoop/common/branches/branch-0.22/common/build.xml (original)
+++ hadoop/common/branches/branch-0.22/common/build.xml Sun Aug  7 01:14:17 2011
@@ -1325,7 +1325,7 @@
 
   target name=simpledeploy unless=staging
  artifact:pom file=${hadoop-common.pom} id=hadoop.core/
- artifact:pom file=${hadoop-common-test.pom} id=hadoop.test/
+ artifact:pom file=${hadoop-common-test.pom} id=hadoop.core.test/
  artifact:pom file=${hadoop-common-instrumented.pom} 
id=hadoop.core.${herriot.suffix}/
 

svn commit: r1154636 - in /hadoop/common/branches/branch-0.22/common: CHANGES.txt build.xml

[cos]

Author: cos
Date: Sun Aug  7 01:52:50 2011
New Revision: 1154636

URL: http://svn.apache.org/viewvc?rev=1154636view=rev
Log:
HADOOP-7514. Build fails with ClassCastException when running both mvn-install 
and mvn-deploy targets. Contributed by Joep Rottinghuis.

Modified:
hadoop/common/branches/branch-0.22/common/CHANGES.txt
hadoop/common/branches/branch-0.22/common/build.xml

Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1154636r1=1154635r2=1154636view=diff
==
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Sun Aug  7 01:52:50 
2011
@@ -527,6 +527,9 @@ Release 0.22.0 - Unreleased
 
 HADOOP-7513. mvn-deploy target fails (Joep Rottinghuis via cos)
 
+HADOOP-7514. Build fails with ClassCastException when running both
+mvn-install and mvn-deploy targets (Joep Rottinghuis via cos)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/common/branches/branch-0.22/common/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/build.xml?rev=1154636r1=1154635r2=1154636view=diff
==
--- hadoop/common/branches/branch-0.22/common/build.xml (original)
+++ hadoop/common/branches/branch-0.22/common/build.xml Sun Aug  7 01:52:50 2011
@@ -1215,11 +1215,13 @@
 get src=${ant_task_repo_url} dest=${ant_task.jar} 
usetimestamp=true/
   /target
 
-  target name=mvn-taskdef depends=ant-task-download
+  target name=mvn-taskdef depends=ant-task-download 
unless=mvn-taskdef.called
  path id=mvn-ant-task.classpath path=${ant_task.jar}/ 
  typedef resource=org/apache/maven/artifact/ant/antlib.xml 
  uri=urn:maven-artifact-ant
  classpathref=mvn-ant-task.classpath/
+   !-- Record that this target is already called to avoid 
ClassCastException. --
+   property name=mvn-taskdef.called value=true /
   /target   
 
   target name=mvn-install 
depends=mvn-taskdef,jar,jar-test,set-version,-mvn-system-install

svn commit: r1092847 - in /hadoop/common/trunk: CHANGES.txt src/test/core/org/apache/hadoop/cli/CLITestHelper.java src/test/core/org/apache/hadoop/cli/TestCLI.java src/test/core/org/apache/hadoop/cli/

[cos]

Author: cos
Date: Sat Apr 16 00:23:46 2011
New Revision: 1092847

URL: http://svn.apache.org/viewvc?rev=1092847view=rev
Log:
HADOOP-7014. Generalize CLITest structure and interfaces to facilitate
upstream adoption (e.g. for web testing). Contributed by Konstantin Boudnik

Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/CLITestHelper.java
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/TestCLI.java

hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLITestData.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1092847r1=1092846r2=1092847view=diff
==
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Sat Apr 16 00:23:46 2011
@@ -90,6 +90,9 @@ Trunk (unreleased changes)
 
 HADOOP-7224. Add CommandFactory to shell.  (Daryn Sharp via szetszwo)
 
+HADOOP-7014. Generalize CLITest structure and interfaces to facilitate
+upstream adoption (e.g. for web testing). (cos)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/CLITestHelper.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/CLITestHelper.java?rev=1092847r1=1092846r2=1092847view=diff
==
--- hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/CLITestHelper.java 
(original)
+++ hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/CLITestHelper.java 
Sat Apr 16 00:23:46 2011
@@ -20,16 +20,12 @@ package org.apache.hadoop.cli;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.cli.util.CLITestData;
-import org.apache.hadoop.cli.util.CLITestData.TestCmd;
-import org.apache.hadoop.cli.util.CLITestData.TestCmd.CommandType;
-import org.apache.hadoop.cli.util.CommandExecutor;
+import org.apache.hadoop.cli.util.*;
+import org.apache.hadoop.cli.util.CLITestCmd;
+import org.apache.hadoop.cli.util.CLICommand;
 import org.apache.hadoop.cli.util.CommandExecutor.Result;
-import org.apache.hadoop.cli.util.ComparatorBase;
-import org.apache.hadoop.cli.util.ComparatorData;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
-import org.apache.hadoop.security.authorize.ServiceAuthorizationManager;
 import org.apache.hadoop.util.StringUtils;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -72,7 +68,6 @@ public class CLITestHelper {
   protected Configuration conf = null;
   protected String clitestDataDir = null;
   protected String username = null;
-  
   /**
* Read the test config file - testConfig.xml
*/
@@ -83,7 +78,7 @@ public class CLITestHelper {
   testConfigFile = TEST_CACHE_DATA_DIR + File.separator + testConfigFile;
   try {
 SAXParser p = (SAXParserFactory.newInstance()).newSAXParser();
-p.parse(testConfigFile, new TestConfigFileParser());
+p.parse(testConfigFile, getConfigParser());
 success = true;
   } catch (Exception e) {
 LOG.info(File:  + testConfigFile +  not found);
@@ -92,7 +87,19 @@ public class CLITestHelper {
   assertTrue(Error reading test config file, success);
 }
   }
-  
+
+  /**
+   * Method decides what is a proper configuration file parser for this type
+   * of CLI tests.
+   * Ancestors need to override the implementation if a parser with additional
+   * features is needed. Also, such ancestor has to provide its own
+   * TestConfigParser implementation
+   * @return an instance of TestConfigFileParser class
+   */
+  protected TestConfigFileParser getConfigParser () {
+return new TestConfigFileParser();
+  }
+
   protected String getTestFile() {
 return ;
   }
@@ -151,15 +158,15 @@ public class CLITestHelper {
 LOG.info(   Test Description: [ + td.getTestDesc() + ]);
 LOG.info();
 
-ArrayListTestCmd testCommands = td.getTestCommands();
-for (TestCmd cmd : testCommands) {
+ArrayListCLICommand testCommands = td.getTestCommands();
+for (CLICommand cmd : testCommands) {
   LOG.info(  Test Commands: [ + 
expandCommand(cmd.getCmd()) + ]);
 }
 
 LOG.info();
-ArrayListTestCmd cleanupCommands = td.getCleanupCommands();
-for (TestCmd cmd : cleanupCommands) {
+ArrayListCLICommand cleanupCommands = td.getCleanupCommands();
+for (CLICommand cmd : cleanupCommands) {
   LOG.info(   Cleanup Commands: [ +
expandCommand(cmd.getCmd()) + ]);
 }
@@ -303,12 +310,12 @@ public class CLITestHelper {
 // Run the tests defined in the testConf.xml config file.
 for (int index = 0; index  testsFromConfigFile.size

svn commit: r1092853 - in /hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util: CLICommand.java CLICommandFS.java CLICommandTypes.java CLICommands.java CLITestCmd.java CmdFactory.java FSCmdEx

[cos]

Author: cos
Date: Sat Apr 16 01:43:30 2011
New Revision: 1092853

URL: http://svn.apache.org/viewvc?rev=1092853view=rev
Log:
HADOOP-7014. Adding missed files

Added:
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommand.java

hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandFS.java

hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandTypes.java
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLITestCmd.java

hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/FSCmdExecutor.java
Removed:

hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommands.java
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CmdFactory.java

Added: 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommand.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommand.java?rev=1092853view=auto
==
--- 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommand.java 
(added)
+++ 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommand.java 
Sat Apr 16 01:43:30 2011
@@ -0,0 +1,28 @@
+/**
+ * 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
+ * p/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * p/
+ * 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.
+ */
+package org.apache.hadoop.cli.util;
+
+/**
+ * This interface is to generalize types of test command for upstream projects
+ */
+public interface CLICommand {
+  public CommandExecutor getExecutor(String tag) throws 
IllegalArgumentException;
+  public CLICommandTypes getType();
+  public String getCmd();
+  public String toString();
+}

Added: 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandFS.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandFS.java?rev=1092853view=auto
==
--- 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandFS.java 
(added)
+++ 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandFS.java 
Sat Apr 16 01:43:30 2011
@@ -0,0 +1,21 @@
+/**
+ * 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
+ * p/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * p/
+ * 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.
+ */
+package org.apache.hadoop.cli.util;
+
+public class CLICommandFS implements CLICommandTypes {
+}

Added: 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandTypes.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandTypes.java?rev=1092853view=auto
==
--- 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandTypes.java
 (added)
+++ 
hadoop/common/trunk/src/test/core/org/apache/hadoop/cli/util/CLICommandTypes.java
 Sat Apr 16 01:43:30 2011
@@ -0,0 +1,24 @@
+/**
+ * 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
+ * p/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * p/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under

svn commit: r1087896 - in /hadoop/common/trunk: CHANGES.txt build.xml

[cos]

Author: cos
Date: Fri Apr  1 21:00:46 2011
New Revision: 1087896

URL: http://svn.apache.org/viewvc?rev=1087896view=rev
Log:
HADOOP-7019 Refactor build targets to enable faster cross project dev cycles. 
Contributed by Luke Lu.

Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/build.xml

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1087896r1=1087895r2=1087896view=diff
==
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Fri Apr  1 21:00:46 2011
@@ -127,6 +127,9 @@ Trunk (unreleased changes)
 HADOOP-7215. RPC clients must use network interface corresponding to 
 the host in the client's kerberos principal key. (suresh)
 
+HADOOP-7019. Refactor build targets to enable faster cross project dev
+cycles. (Luke Lu via cos)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=1087896r1=1087895r2=1087896view=diff
==
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Fri Apr  1 21:00:46 2011
@@ -1288,8 +1288,8 @@
  classpathref=mvn-ant-task.classpath/
   /target   
 
-  target name=mvn-install 
depends=mvn-taskdef,jar,jar-test,set-version,-mvn-system-install
- description=To install hadoop common and test jars to local filesystem's 
m2 cache
+  target name=mvn-install depends=mvn-taskdef,jar,jar-test,set-version
+description=Install hadoop common and test jars to local fs m2 repo
  artifact:pom file=${hadoop-common.pom} id=hadoop.core/
  artifact:pom file=${hadoop-common-test.pom} id=hadoop.core.test/
  artifact:install file=${hadoop-common.jar}
@@ -1302,7 +1302,9 @@
  /artifact:install
   /target
 
-  
+  target name=mvn-si-install depends=mvn-install,-mvn-system-install
+ description=Install system integration test jars as well/
+
   target name=mvn-deploy depends=mvn-taskdef, jar, jar-test,
  jar-system, set-version, signanddeploy, simpledeploy
  description=To deploy hadoop common and test jar's to apache

svn commit: r1071021 - in /hadoop/common/trunk: CHANGES.txt build.xml

[cos]

Author: cos
Date: Tue Feb 15 19:30:12 2011
New Revision: 1071021

URL: http://svn.apache.org/viewvc?rev=1071021view=rev
Log:
HADOOP-7094. hadoop.css got lost during project split. Contributed by 
Konstantin Boudnik.

Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/build.xml

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1071021r1=1071020r2=1071021view=diff
==
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Tue Feb 15 19:30:12 2011
@@ -491,6 +491,8 @@ Release 0.22.0 - Unreleased
 
 HADOOP-7140. IPC Reader threads do not stop when server stops (todd)
 
+HADOOP-7094. hadoop.css got lost during project split (cos)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/common/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=1071021r1=1071020r2=1071021view=diff
==
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Tue Feb 15 19:30:12 2011
@@ -43,6 +43,7 @@
   property name=docs.src value=${basedir}/src/docs/
   property name=src.docs.cn value=${basedir}/src/docs/cn/
   property name=changes.src value=${docs.src}/changes/
+  property name=src.webapps value=${basedir}/src/webapps/
 
   property name=build.dir value=${basedir}/build/
   property name=build.classes value=${build.dir}/classes/
@@ -274,6 +275,12 @@
 /touch
 delete file=${touch.temp.file}/
 !-- copy all of the jsp and static files --
+copy todir=${build.webapps}
+  fileset dir=${src.webapps}
+exclude name=**/*.jsp /
+exclude name=**/*.jspx /
+  /fileset
+/copy
 
 copy todir=${conf.dir} verbose=true
   fileset dir=${conf.dir} includes=**/*.template/
@@ -1118,6 +1125,10 @@
   fileset file=${contrib.dir}/build.xml/
 /subant  
 
+copy todir=${dist.dir}/webapps
+  fileset dir=${build.webapps}/
+/copy
+
 copy todir=${dist.dir} 
   fileset file=${build.dir}/${final.name}.jar/
   fileset file=${build.dir}/${test.final.name}.jar/

svn commit: r1071022 - in /hadoop/common/branches/branch-0.22: ./ CHANGES.txt build.xml src/docs/ src/java/ src/test/core/ src/test/core/org/apache/hadoop/io/TestSequenceFile.java

[cos]

Author: cos
Date: Tue Feb 15 19:32:07 2011
New Revision: 1071022

URL: http://svn.apache.org/viewvc?rev=1071022view=rev
Log:
HADOOP-7094. svn merge -c 1071021 from trunk

Modified:
hadoop/common/branches/branch-0.22/   (props changed)
hadoop/common/branches/branch-0.22/CHANGES.txt   (contents, props changed)
hadoop/common/branches/branch-0.22/build.xml
hadoop/common/branches/branch-0.22/src/docs/   (props changed)
hadoop/common/branches/branch-0.22/src/java/   (props changed)
hadoop/common/branches/branch-0.22/src/test/core/   (props changed)

hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
   (props changed)

Propchange: hadoop/common/branches/branch-0.22/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 19:32:07 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021
+/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
 /hadoop/core/branches/branch-0.19/core:713112

Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1071022r1=1071021r2=1071022view=diff
==
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Tue Feb 15 19:32:07 2011
@@ -418,6 +418,8 @@ Release 0.22.0 - Unreleased
 
 HADOOP-7140. IPC Reader threads do not stop when server stops (todd)
 
+HADOOP-7094. hadoop.css got lost during project split (cos)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 19:32:07 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021
+/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278

Modified: hadoop/common/branches/branch-0.22/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/build.xml?rev=1071022r1=1071021r2=1071022view=diff
==
--- hadoop/common/branches/branch-0.22/build.xml (original)
+++ hadoop/common/branches/branch-0.22/build.xml Tue Feb 15 19:32:07 2011
@@ -43,6 +43,7 @@
   property name=docs.src value=${basedir}/src/docs/
   property name=src.docs.cn value=${basedir}/src/docs/cn/
   property name=changes.src value=${docs.src}/changes/
+  property name=src.webapps value=${basedir}/src/webapps/
 
   property name=build.dir value=${basedir}/build/
   property name=build.classes value=${build.dir}/classes/
@@ -274,6 +275,12 @@
 /touch
 delete file=${touch.temp.file}/
 !-- copy all of the jsp and static files --
+copy todir=${build.webapps}
+  fileset dir=${src.webapps}
+exclude name=**/*.jsp /
+exclude name=**/*.jspx /
+  /fileset
+/copy
 
 copy todir=${conf.dir} verbose=true
   fileset dir=${conf.dir} includes=**/*.template/
@@ -1109,6 +1116,10 @@
   fileset file=${contrib.dir}/build.xml/
 /subant  
 
+copy todir=${dist.dir}/webapps
+  fileset dir=${build.webapps}/
+/copy
+
 copy todir=${dist.dir} 
   fileset file=${build.dir}/${final.name}.jar/
   fileset file=${build.dir}/${test.final.name}.jar/

Propchange: hadoop/common/branches/branch-0.22/src/docs/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 19:32:07 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021
+/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
 /hadoop/core/branches/branch-0.19/src/docs:713112

Propchange: hadoop/common/branches/branch-0.22/src/java/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 19:32:07 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021
+/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
 /hadoop/core/branches/branch

svn commit: r1071084 - in /hadoop/common/trunk/src/webapps: ./ static/ static/hadoop.css

[cos]

Author: cos
Date: Tue Feb 15 22:01:23 2011
New Revision: 1071084

URL: http://svn.apache.org/viewvc?rev=1071084view=rev
Log:
HADOOP-7094. hadoop.css got lost during project split
Committing missed folder

Added:
hadoop/common/trunk/src/webapps/
hadoop/common/trunk/src/webapps/static/
hadoop/common/trunk/src/webapps/static/hadoop.css

Added: hadoop/common/trunk/src/webapps/static/hadoop.css
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/webapps/static/hadoop.css?rev=1071084view=auto
==
--- hadoop/common/trunk/src/webapps/static/hadoop.css (added)
+++ hadoop/common/trunk/src/webapps/static/hadoop.css Tue Feb 15 22:01:23 2011
@@ -0,0 +1,134 @@
+/*
+* 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.
+*/
+
+body {
+  background-color : #ff;
+  font-family : sans-serif;
+}
+
+.small {
+  font-size : smaller;
+}
+
+div#dfsnodetable tr#row1, div#dfstable td#col1 {
+   font-weight : bolder;
+}
+
+div#dfstable td#col1 {
+   vertical-align : top;
+}
+
+div#dfstable td#col3 {
+   text-align : right;
+}
+
+div#dfsnodetable caption {
+   text-align : left;
+}
+
+div#dfsnodetable a#title {
+   font-size : larger;
+   font-weight : bolder;
+}
+
+div#dfsnodetable td, th {
+   border-bottom-style : none;
+padding-bottom : 4px;
+padding-top : 4px;
+}
+
+div#dfsnodetable A:link, A:visited {
+   text-decoration : none;
+}
+
+div#dfsnodetable th.header, th.headerASC, th.headerDSC {
+padding-bottom : 8px;
+padding-top : 8px;
+}
+div#dfsnodetable th.header:hover, th.headerASC:hover, th.headerDSC:hover,
+ td.name:hover {
+text-decoration : underline;
+   cursor : pointer;
+}
+
+div#dfsnodetable td.blocks, td.size, td.pcused, td.adminstate, td.lastcontact {
+   text-align : right;
+}
+
+div#dfsnodetable .rowNormal .header {
+   background-color : #ff;
+}
+div#dfsnodetable .rowAlt, .headerASC, .headerDSC {
+   background-color : lightyellow;
+}
+
+.warning {
+font-weight : bolder;
+color : red;
+}
+
+div#dfstable table {
+   white-space : pre;
+}
+
+div#dfsnodetable td, div#dfsnodetable th, div#dfstable td {
+   padding-left : 10px;
+   padding-right : 10px;
+}
+
+td.perc_filled {
+  background-color:#FF;
+}
+
+td.perc_nonfilled {
+  background-color:#FF;
+}
+
+line.taskgraphline {
+  stroke-width:1;stroke-linecap:round;
+}
+
+#quicklinks {
+   margin: 0;
+   padding: 2px 4px;
+   position: fixed;
+   top: 0;
+   right: 0;
+   text-align: right;
+   background-color: #eee;
+   font-weight: bold;
+}
+
+#quicklinks ul {
+   margin: 0;
+   padding: 0;
+   list-style-type: none;
+   font-weight: normal;
+}
+
+#quicklinks ul {
+   display: none;
+}
+
+#quicklinks a {
+   font-size: smaller;
+   text-decoration: none;
+}
+
+#quicklinks ul a {
+   text-decoration: underline;
+}

svn commit: r1071086 - in /hadoop/common/branches/branch-0.22: ./ CHANGES.txt src/docs/ src/java/ src/test/core/ src/test/core/org/apache/hadoop/io/TestSequenceFile.java src/webapps/ src/webapps/stati

[cos]

Author: cos
Date: Tue Feb 15 22:02:19 2011
New Revision: 1071086

URL: http://svn.apache.org/viewvc?rev=1071086view=rev
Log:
HADOOP-7094. svn merge -c 1071084 from trunk

Added:
hadoop/common/branches/branch-0.22/src/webapps/
  - copied from r1071084, hadoop/common/trunk/src/webapps/
hadoop/common/branches/branch-0.22/src/webapps/static/
  - copied from r1071084, hadoop/common/trunk/src/webapps/static/
hadoop/common/branches/branch-0.22/src/webapps/static/hadoop.css
  - copied unchanged from r1071084, 
hadoop/common/trunk/src/webapps/static/hadoop.css
Modified:
hadoop/common/branches/branch-0.22/   (props changed)
hadoop/common/branches/branch-0.22/CHANGES.txt   (props changed)
hadoop/common/branches/branch-0.22/src/docs/   (props changed)
hadoop/common/branches/branch-0.22/src/java/   (props changed)
hadoop/common/branches/branch-0.22/src/test/core/   (props changed)

hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
   (props changed)

Propchange: hadoop/common/branches/branch-0.22/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 22:02:19 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
+/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084
 /hadoop/core/branches/branch-0.19/core:713112

Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 22:02:19 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
+/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278

Propchange: hadoop/common/branches/branch-0.22/src/docs/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 22:02:19 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
+/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084
 /hadoop/core/branches/branch-0.19/src/docs:713112

Propchange: hadoop/common/branches/branch-0.22/src/java/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 22:02:19 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
+/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084
 /hadoop/core/branches/branch-0.19/core/src/java:713112
 /hadoop/core/trunk/src/core:776175-785643,785929-786278

Propchange: hadoop/common/branches/branch-0.22/src/test/core/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 22:02:19 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
+/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084
 /hadoop/core/branches/branch-0.19/core/src/test/core:713112
 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278

Propchange: 
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 22:02:19 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021
+/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084
 
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:713112
 
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:776175-785643