Author: acmurthy
Date: Sun Mar  4 19:38:09 2012
New Revision: 1296862

URL: http://svn.apache.org/viewvc?rev=1296862&view=rev
Log:
Merge -c 1296861 from trunk to branch-0.23 to fix HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the project.

Modified:
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1296862&r1=1296861&r2=1296862&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Sun Mar  4 19:38:09 2012
@@ -169,6 +169,9 @@ Release 0.23.2 - UNRELEASED 
     HADOOP-8131. FsShell put doesn't correctly handle a non-existent dir
     (Daryn Sharp via bobby)
 
+    HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the
+    project. (Jonathan Eagles via acmurthy) 
+
 Release 0.23.1 - 2012-02-17 
 
   INCOMPATIBLE CHANGES