hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkesa...@apache.org
Subject svn commit: r1161793 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt ivy.xml ivy/libraries.properties src/contrib/block_forensics/ivy.xml
Date Thu, 25 Aug 2011 23:09:10 GMT
Author: gkesavan
Date: Thu Aug 25 23:09:10 2011
New Revision: 1161793

URL: http://svn.apache.org/viewvc?rev=1161793&view=rev
Log:
merge 1161782 from trunk

Modified:
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt   (contents, props
changed)
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy/libraries.properties
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics/ivy.xml

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1161793&r1=1161792&r2=1161793&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu Aug 25 23:09:10
2011
@@ -1147,6 +1147,8 @@ Release 0.23.0 - Unreleased
     (Devaraj K via acmurthy) 
 
     MAPREDUCE-2879. Fix version for MR-279 to 0.23.0. (acmurthy) 
+   
+    MAPREDUCE-2881. Fix to include log4j 1.2.16 depenency (gkesavan)
 
 Release 0.22.0 - Unreleased
 

Propchange: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 23:09:10 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:1161777,1161781
+/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:1161777,1161781-1161782
 /hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112
 /hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml?rev=1161793&r1=1161792&r2=1161793&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml Thu Aug 25 23:09:10
2011
@@ -71,9 +71,6 @@
                rev="${hadoop-hdfs.version}" conf="system->default"/>
    <dependency org="commons-logging" name="commons-logging" 
                rev="${commons-logging.version}" conf="compile->master"/>
-  <!-- <dependency org="log4j" name="log4j" rev="${log4j.version}" 
-               conf="compile->master"/>-->
-
    <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" 
                conf="compile->master"/>
    <dependency org="org.slf4j" name="slf4j-log4j12" 

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy/libraries.properties?rev=1161793&r1=1161792&r2=1161793&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy/libraries.properties Thu
Aug 25 23:09:10 2011
@@ -46,7 +46,7 @@ hadoop-hdfs.version=0.23.0-SNAPSHOT
 
 hsqldb.version=1.8.0.10
 
-ivy.version=2.1.0
+ivy.version=2.2.0
 
 jasper.version=5.5.12
 jdeb.version=0.8
@@ -60,7 +60,7 @@ jdiff.version=1.0.9
 
 kfs.version=0.3
 
-log4j.version=1.2.15
+log4j.version=1.2.16
 lucene-core.version=2.3.1
 
 mina-core.version=2.0.0-M5

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics/ivy.xml?rev=1161793&r1=1161792&r2=1161793&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics/ivy.xml
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics/ivy.xml
Thu Aug 25 23:09:10 2011
@@ -46,5 +46,7 @@
                 rev="${hadoop-common.version}" conf="common->default"/>  
    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" 
                rev="${yarn.version}" conf="common->default"/>
+   <dependency org="log4j" name="log4j" rev="${log4j.version}"
+               conf="common->master"/> 
   </dependencies>
 </ivy-module>



Mime
View raw message