Author: suresh
Date: Tue Jan 29 21:35:24 2013
New Revision: 1440155
URL: http://svn.apache.org/viewvc?rev=1440155&view=rev
Log:
Merging trunk to branch-trunk-win
Removed:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/forrest.properties
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1440155&r1=1440154&r2=1440155&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Jan 29 21:35:24 2013
@@ -328,6 +328,11 @@ Trunk (Unreleased)
HADOOP-8589 ViewFs tests fail when tests and home dirs are nested (sanjay
Radia)
+ HADOOP-9246 Execution phase for hadoop-maven-plugin should be
+ process-resources (Karthik Kambatla and Chris Nauroth via jlowe)
+
+ HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
+
Release 2.0.3-alpha - Unreleased
INCOMPATIBLE CHANGES
@@ -575,6 +580,9 @@ Release 2.0.3-alpha - Unreleased
HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created
(only libhadoop.so.1.0.0) (Colin Patrick McCabe via todd)
+ HADOOP-8857. hadoop.http.authentication.signature.secret.file docs
+ should not state that secret is randomly generated. (tucu)
+
Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES
@@ -1293,6 +1301,10 @@ Release 0.23.6 - UNRELEASED
HADOOP-9242. Duplicate surefire plugin config in hadoop-common.
(Andrey Klochkov via suresh)
+ HADOOP-9247. Parametrize Clover "generateXxx" properties to make them
+ re-definable via -D in mvn calls. (Ivan A. Veselovsky via suresh)
+
+
OPTIMIZATIONS
BUG FIXES
@@ -1310,6 +1322,8 @@ Release 0.23.6 - UNRELEASED
HADOOP-9097. Maven RAT plugin is not checking all source files (tgraves)
+ HADOOP-9255. relnotes.py missing last jira (tgraves)
+
Release 0.23.5 - 2012-11-28
Propchange:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1438241-1440147
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml?rev=1440155&r1=1440154&r2=1440155&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml
Tue Jan 29 21:35:24 2013
@@ -279,7 +279,7 @@
<executions>
<execution>
<id>version-info</id>
- <phase>compile</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>version-info</goal>
</goals>
Propchange:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1438241-1440147
Propchange:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1438241-1440147
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1440155&r1=1440154&r2=1440155&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
Tue Jan 29 21:35:24 2013
@@ -890,7 +890,6 @@
<value>${user.home}/hadoop-http-auth-signature-secret</value>
<description>
The signature secret for signing the authentication tokens.
- If not set a random secret is generated at startup time.
The same secret should be used for JT/NN/DN/TT configurations.
</description>
</property>
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm?rev=1440155&r1=1440154&r2=1440155&view=diff
==============================================================================
---
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm
(original)
+++
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm
Tue Jan 29 21:35:24 2013
@@ -64,10 +64,9 @@ Authentication for Hadoop HTTP web-conso
The default value is <<<36000>>>.
<<<hadoop.http.authentication.signature.secret.file>>>: The signature secret
- file for signing the authentication tokens. If not set a random secret is
- generated at startup time. The same secret should be used for all nodes
- in the cluster, JobTracker, NameNode, DataNode and TastTracker. The
- default value is <<<${user.home}/hadoop-http-auth-signature-secret>>>.
+ file for signing the authentication tokens. The same secret should be used
+ for all nodes in the cluster, JobTracker, NameNode, DataNode and
TastTracker.
+ The default value is <<<${user.home}/hadoop-http-auth-signature-secret>>>.
IMPORTANT: This file should be readable only by the Unix user running the
daemons.
Propchange:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1438241-1440147
