svn commit: r1170047 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/packages/templates/conf/hadoop-env.sh
Author: ddas
Date: Tue Sep 13 05:44:10 2011
New Revision: 1170047
URL: http://svn.apache.org/viewvc?rev=1170047&view=rev
Log:
Merge -r 1170045:1170046 from trunk onto branch-0.23. Fixes HADOOP-7626.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh
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=1170047&r1=1170046&r2=1170047&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
Tue Sep 13 05:44:10 2011
@@ -571,6 +571,8 @@ Release 0.23.0 - Unreleased
HADOOP-7328. When a serializer class is missing, return null, not throw
an NPE. (Harsh J Chouraria via todd)
+HADOOP-7626. Bugfix for a config generator (Eric Yang via ddas)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 05:44:10 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161777,1161781,1162008,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1164255,1164301,1166402,1167383,1169986
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161777,1161781,1162008,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1164255,1164301,1166402,1167383,1169986,1170046
/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.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh?rev=1170047&r1=1170046&r2=1170047&view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh
Tue Sep 13 05:44:10 2011
@@ -12,7 +12,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR
# Extra Java CLASSPATH elements. Automatically insert capacity-scheduler.
for f in $HADOOP_HOME/contrib/capacity-scheduler/*.jar; do
if [ "$HADOOP_CLASSPATH" ]; then
-export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:$f
+export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f
else
export HADOOP_CLASSPATH=$f
fi
@@ -23,7 +23,7 @@ done
#export HADOOP_NAMENODE_INIT_HEAPSIZE=""
# Extra Java runtime options. Empty by default.
-export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true ${HADOOP_OPTS}"
+export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
# Command specific options appended to HADOOP_OPTS when specified
export HADOOP_NAMENODE_OPTS="-Dsecurity.audit.logger=INFO,DRFAS
-Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_NAMENODE_OPTS}"
svn commit: r1170046 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/packages/templates/conf/hadoop-env.sh
Author: ddas
Date: Tue Sep 13 05:42:49 2011
New Revision: 1170046
URL: http://svn.apache.org/viewvc?rev=1170046&view=rev
Log:
HADOOP-7626. Bugfix for a config generator. Contributed by Eric Yang.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh
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=1170046&r1=1170045&r2=1170046&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Sep
13 05:42:49 2011
@@ -581,6 +581,8 @@ Release 0.23.0 - Unreleased
HADOOP-7328. When a serializer class is missing, return null, not throw
an NPE. (Harsh J Chouraria via todd)
+HADOOP-7626. Bugfix for a config generator (Eric Yang via ddas)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh?rev=1170046&r1=1170045&r2=1170046&view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh
Tue Sep 13 05:42:49 2011
@@ -12,7 +12,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR
# Extra Java CLASSPATH elements. Automatically insert capacity-scheduler.
for f in $HADOOP_HOME/contrib/capacity-scheduler/*.jar; do
if [ "$HADOOP_CLASSPATH" ]; then
-export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:$f
+export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f
else
export HADOOP_CLASSPATH=$f
fi
@@ -23,7 +23,7 @@ done
#export HADOOP_NAMENODE_INIT_HEAPSIZE=""
# Extra Java runtime options. Empty by default.
-export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true ${HADOOP_OPTS}"
+export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
# Command specific options appended to HADOOP_OPTS when specified
export HADOOP_NAMENODE_OPTS="-Dsecurity.audit.logger=INFO,DRFAS
-Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_NAMENODE_OPTS}"
svn commit: r1170043 - in /hadoop/common/branches/branch-0.20-security-205: ./ src/core/org/apache/hadoop/fs/ src/mapred/ src/packages/templates/conf/ src/test/org/apache/hadoop/fs/ src/tools/org/apac
Author: ddas Date: Tue Sep 13 05:17:09 2011 New Revision: 1170043 URL: http://svn.apache.org/viewvc?rev=1170043&view=rev Log: Merge -r 1170041:1170042 from branch-0.20-security onto branch-0.20-security-205 Modified: hadoop/common/branches/branch-0.20-security-205/ (props changed) hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/fs/HarFileSystem.java (props changed) hadoop/common/branches/branch-0.20-security-205/src/mapred/ (props changed) hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/fs/TestHarFileSystem.java (props changed) hadoop/common/branches/branch-0.20-security-205/src/tools/org/apache/hadoop/tools/HadoopArchives.java (props changed) Propchange: hadoop/common/branches/branch-0.20-security-205/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 13 05:17:09 2011 @@ -1,5 +1,6 @@ /hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225 /hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329 +/hadoop/common/branches/branch-0.20-security:1170042 /hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115 /hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413 /hadoop/core/branches/branch-0.19:713112 Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1170043&r1=1170042&r2=1170043&view=diff == --- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Tue Sep 13 05:17:09 2011 @@ -134,6 +134,8 @@ Release 0.20.205.0 - 2011.09.12 HDFS-1260. Block lost when multiple DNs trying to recover it to different genstamps. (Todd Lipcon via jitendra) +HADOOP-7626. Bugfix for a config generator (Eric Yang via ddas) + IMPROVEMENTS MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 13 05:17:09 2011 @@ -1,5 +1,6 @@ /hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225 /hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329 +/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042 /hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115 /hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 Propchange: hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/fs/HarFileSystem.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 13 05:17:09 2011 @@ -1,5 +1,6 @@ /hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/HarFileSystem.java:990003 /hadoop/common/branches/branch-0.20-append/src/core/org/apache/hadoop/fs/HarFileSystem.java:955380,955398,955448,956329 +/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/fs/HarFileSystem.java:1170042 /hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/fs/HarFileSystem.java:1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115 /hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/fs/HarFileSystem.java:1128390 /hadoop/common/trunk/src/core/org/apache/hadoop/fs/HarFileSystem.java:910709 Propchange: hadoop/common/branches/branch-0.20-security-205/src/mapred/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 13 05:17:09 2011 @@ -1,5 +1,6 @@ /hadoop/common/branches/branch-0.20/src/mapred:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225 /hadoop/common/branches/branch-0.20-append/src/mapred:955380,955398,955448,956329 +/hadoop/common/branc
svn commit: r1170042 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt src/packages/templates/conf/hadoop-env.sh
Author: ddas
Date: Tue Sep 13 05:14:18 2011
New Revision: 1170042
URL: http://svn.apache.org/viewvc?rev=1170042&view=rev
Log:
HADOOP-7626. Bugfix for a config generator. Contributed by Eric Yang.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1170042&r1=1170041&r2=1170042&view=diff
==
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Tue Sep 13 05:14:18
2011
@@ -142,6 +142,8 @@ Release 0.20.205.0 - unreleased
HDFS-1260. Block lost when multiple DNs trying to recover it to different
genstamps. (Todd Lipcon via jitendra)
+HADOOP-7626. Bugfix for a config generator (Eric Yang via ddas)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Modified:
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh?rev=1170042&r1=1170041&r2=1170042&view=diff
==
---
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
(original)
+++
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
Tue Sep 13 05:14:18 2011
@@ -12,7 +12,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR
# Extra Java CLASSPATH elements. Automatically insert capacity-scheduler.
for f in $HADOOP_HOME/contrib/capacity-scheduler/*.jar; do
if [ "$HADOOP_CLASSPATH" ]; then
-export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:$f
+export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f
else
export HADOOP_CLASSPATH=$f
fi
@@ -23,7 +23,7 @@ done
#export HADOOP_NAMENODE_INIT_HEAPSIZE=""
# Extra Java runtime options. Empty by default.
-export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true ${HADOOP_OPTS}"
+export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
# Command specific options appended to HADOOP_OPTS when specified
export HADOOP_NAMENODE_OPTS="-Dsecurity.audit.logger=INFO,DRFAS
-Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_NAMENODE_OPTS}"
svn commit: r1169988 - /hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Author: ddas
Date: Tue Sep 13 00:38:35 2011
New Revision: 1169988
URL: http://svn.apache.org/viewvc?rev=1169988&view=rev
Log:
Merge -r 1169985:1169986 from trunk onto 0.23
Modified:
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1169988&r1=1169987&r2=1169988&view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Tue Sep 13 00:38:35 2011
@@ -79,6 +79,13 @@
+ ${basedir}/src/main/packages/templates/conf
+
/share/hadoop/${hadoop.component}/templates/conf
+
+*
+
+
+
${project.build.directory}
/share/hadoop/${hadoop.component}
svn commit: r1169986 [2/2] - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/main/packages/ src/main/packages/deb/init.d/ src/main/packages/rpm/init.d/ src/main/packages/templates/
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml?rev=1169986&view=auto
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
(added)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
Tue Sep 13 00:31:29 2011
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+
+
+mapred.tasktracker.tasks.sleeptime-before-sigkill
+250
+Normally, this is the amount of time before killing
+ processes, and the recommended-default is 5.000 seconds - a value of
+ 5000 here. In this case, we are using it solely to blast tasks before
+ killing them, and killing them very quickly (1/4 second) to guarantee
+ that we do not leave VMs around for later jobs.
+
+
+
+
+mapred.system.dir
+/mapred/mapredsystem
+true
+
+
+
+mapred.job.tracker
+${HADOOP_JT_HOST}:9000
+true
+
+
+
+mapred.job.tracker.http.address
+${HADOOP_JT_HOST}:50030
+true
+
+
+
+mapred.local.dir
+${HADOOP_MAPRED_DIR}
+true
+
+
+
+mapreduce.cluster.administrators
+${HADOOP_MR_USER}
+
+
+
+mapred.map.tasks.speculative.execution
+false
+If true, then multiple instances of some map tasks
+ may be executed in parallel.
+
+
+
+mapred.reduce.tasks.speculative.execution
+false
+If true, then multiple instances of some reduce tasks
+ may be executed in parallel.
+
+
+
+mapred.output.compression.type
+BLOCK
+If the job outputs are to compressed as SequenceFiles, how
+ should they be compressed? Should be one of NONE, RECORD or BLOCK.
+
+
+
+
+jetty.connector
+org.mortbay.jetty.nio.SelectChannelConnector
+
+
+
+mapred.task.tracker.task-controller
+${TASK_CONTROLLER}
+
+
+
+mapred.child.root.logger
+INFO,TLA
+
+
+
+stream.tmpdir
+${mapred.temp.dir}
+
+
+
+
+mapred.child.java.opts
+-server -Xmx640m -Djava.net.preferIPv4Stack=true
+
+
+
+mapred.child.ulimit
+8388608
+
+
+
+mapred.job.tracker.persist.jobstatus.active
+true
+Indicates if persistency of job status information is
+ active or not.
+
+
+
+
+mapred.job.tracker.persist.jobstatus.dir
+file:///${HADOOP_LOG_DIR}/${HADOOP_MR_USER}/jobstatus
+The directory where the job status information is persisted
+ in a file system to be available after it drops of the memory queue and
+ between jobtracker restarts.
+
+
+
+
+mapred.job.tracker.history.completed.location
+/mapred/history/done
+
+
+
+mapred.heartbeats.in.second
+200
+to enable HADOOP:5784
+
+
+
+mapreduce.tasktracker.outofband.heartbeat
+true
+to enable MAPREDUCE:270
+
+
+
+mapred.jobtracker.maxtasks.per.job
+20
+true
+The maximum number of tasks for a single job.
+ A value of -1 indicates that there is no maximum.
+
+
+
+
+mapreduce.jobtracker.kerberos.principal
+jt/_HOST@${local.realm}
+
+ JT principal
+
+
+
+
+mapreduce.tasktracker.kerberos.principal
+tt/_HOST@${local.realm}
+
+ TT principal.
+
+
+
+
+
+hadoop.job.history.user.location
+none
+
+
+
+mapreduce.jobtracker.keytab.file
+/etc/security/keytabs/jt.service.keytab
+
+The keytab for the jobtracker principal.
+
+
+
+
+mapreduce.tasktracker.keytab.file
+/etc/security/keytabs/tt.service.keytab
+The filename of the keytab for the task tracker
+
+
+
+mapreduce.jobtracker.staging.root.dir
+/user
+The Path prefix for where the staging directories should be
+ placed. The next level is always the user's
+ name. It is a path in the default file system.
+
+
+
+
+
+mapreduce.job.acl-modify-job
+
+
+
+
+mapreduce.job.acl-view-job
+Dr.Who
+
+
+
+mapreduce.tasktracker.group
+${HADOOP_GROUP}
+The group that the task controller uses for accessing the
+ task controller. The mapred user must be a member and users should *not*
+ be members.
+
+
+
+
+mapred.acls.enabled
+true
+
+
+
+mapred.jobtracker.taskScheduler
+org.apache.hadoop.mapred.CapacityTaskScheduler
+
+
+mapred.queue.names
+default
+
+
+
+
+mapreduce.history.server.embedded
+false
+
+
+mapreduce.history.server.http.address
+${HADOOP_JT_HOST}:5
+
+
+mapreduce.jobhistory.kerberos.principal
+jt/_HOST@${local.realm}
+history server principal
+
+
+mapreduce.jobhistory.keytab.file
+/etc/security/keytabs/jt.serv
svn commit: r1169986 - /hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Author: ddas
Date: Tue Sep 13 00:31:29 2011
New Revision: 1169986
URL: http://svn.apache.org/viewvc?rev=1169986&view=rev
Log:
HADOOP-7599. Script improvements to setup a secure Hadoop cluster. Contributed
by Eric Yang.
Modified:
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Modified:
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1169986&r1=1169985&r2=1169986&view=diff
==
---
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Tue Sep 13 00:31:29 2011
@@ -79,6 +79,13 @@
+ ${basedir}/src/main/packages/templates/conf
+
/share/hadoop/${hadoop.component}/templates/conf
+
+*
+
+
+
${project.build.directory}
/share/hadoop/${hadoop.component}
svn commit: r1169944 - in /hadoop/common/branches/branch-0.20-security-205: ./ src/mapred/org/apache/hadoop/mapred/ src/mapred/org/apache/hadoop/mapred/lib/
Author: acmurthy Date: Mon Sep 12 21:36:21 2011 New Revision: 1169944 URL: http://svn.apache.org/viewvc?rev=1169944&view=rev Log: Merge -r 1169941:1169942 from branch-0.20-security to branch-0.20-security-205 to fix MAPREDUCE-1734. Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/Counters.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/FileInputFormat.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/FileSplit.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/ID.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/InputFormat.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/InputSplit.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/JobConf.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/JobConfigurable.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/JobContext.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/JobID.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/LineRecordReader.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/MapReduceBase.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/MapRunnable.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/Mapper.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/OutputCommitter.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/OutputFormat.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/Partitioner.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/Reducer.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/SequenceFileOutputFormat.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/TaskAttemptContext.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/TaskAttemptID.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/TaskID.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/TextInputFormat.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/TextOutputFormat.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/lib/HashPartitioner.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/lib/IdentityMapper.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/lib/IdentityReducer.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/lib/InverseMapper.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/lib/LongSumReducer.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/lib/NullOutputFormat.java hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/lib/TokenCountMapper.java Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1169944&r1=1169943&r2=1169944&view=diff == --- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Mon Sep 12 21:36:21 2011 @@ -205,6 +205,9 @@ Release 0.20.205.0 - 2011.09.12 MAPREDUCE-2981. Backport FairScheduler from trunk. (Matei Zaharia via acmurthy) +MAPREDUCE-1734. Undeprecate old API in branch-0.20-security. (Todd Lipcon +via acmurthy) + Release 0.20.204.0 - 2011-8-25 NEW FEATURES Modified: hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/Counters.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/Counters.java?rev=1169944&r1=1169943&r2=1169944&view=diff == --- hadoop/common/branches/branch-0.20-security-205/src/mapred/org/apache/hadoop/mapred/Counters.java (o
svn commit: r1169942 - in /hadoop/common/branches/branch-0.20-security: ./ src/mapred/org/apache/hadoop/mapred/ src/mapred/org/apache/hadoop/mapred/lib/
Author: acmurthy Date: Mon Sep 12 21:32:20 2011 New Revision: 1169942 URL: http://svn.apache.org/viewvc?rev=1169942&view=rev Log: MAPREDUCE-1734. Undeprecate old API in branch-0.20-security. Contributed by Todd Lipcon. Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/Counters.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/FileInputFormat.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/FileSplit.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/ID.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/InputFormat.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/InputSplit.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/JobConf.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/JobConfigurable.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/JobContext.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/JobID.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/LineRecordReader.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/MapReduceBase.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/MapRunnable.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/Mapper.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/OutputCommitter.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/OutputFormat.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/Partitioner.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/Reducer.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/SequenceFileOutputFormat.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskAttemptContext.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskAttemptID.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskID.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TextInputFormat.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TextOutputFormat.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/lib/HashPartitioner.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/lib/IdentityMapper.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/lib/IdentityReducer.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/lib/InverseMapper.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/lib/LongSumReducer.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/lib/NullOutputFormat.java hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/lib/TokenCountMapper.java Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1169942&r1=1169941&r2=1169942&view=diff == --- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Mon Sep 12 21:32:20 2011 @@ -213,6 +213,9 @@ Release 0.20.205.0 - unreleased MAPREDUCE-2981. Backport FairScheduler from trunk. (Matei Zaharia via acmurthy) +MAPREDUCE-1734. Undeprecate old API in branch-0.20-security. (Todd Lipcon +via acmurthy) + Release 0.20.204.0 - 2011-8-25 NEW FEATURES Modified: hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/Counters.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/Counters.java?rev=1169942&r1=1169941&r2=1169942&view=diff == --- hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/Counters.java (original) +++ hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/Counters.java Mon Sep 12 21:32:20 2011 @@ -47,9 +47,7 @@ import org.apache.had
svn commit: r1169930 - in /hadoop/common/branches/branch-0.22/common: CHANGES.txt src/java/org/apache/hadoop/io/SequenceFile.java
Author: shv
Date: Mon Sep 12 21:18:22 2011
New Revision: 1169930
URL: http://svn.apache.org/viewvc?rev=1169930&view=rev
Log:
HADOOP-7568. SequenceFile should not print into stdout. Contributed by Plamen
Jeliazkov.
Modified:
hadoop/common/branches/branch-0.22/common/CHANGES.txt
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.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=1169930&r1=1169929&r2=1169930&view=diff
==
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Mon Sep 12 21:18:22
2011
@@ -536,6 +536,9 @@ Release 0.22.0 - Unreleased
HADOOP-7577. Add EventCounter wrapper to provide compatibility between
metrics 1 and 2. (Joep Rottinghuis via shv)
+HADOOP-7568. SequenceFile should not print into stdout.
+(Plamen Jeliazkov via shv)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified:
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.java?rev=1169930&r1=1169929&r2=1169930&view=diff
==
---
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.java
(original)
+++
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/io/SequenceFile.java
Mon Sep 12 21:18:22 2011
@@ -1667,7 +1667,6 @@ public class SequenceFile {
try {
seek(start);
this.end = this.in.getPos() + length;
-System.out.println("Setting end to " + end);
// if it wrapped around, use the max
if (end < length) {
end = Long.MAX_VALUE;
svn commit: r1169929 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/io/SequenceFile.java
Author: shv
Date: Mon Sep 12 21:17:12 2011
New Revision: 1169929
URL: http://svn.apache.org/viewvc?rev=1169929&view=rev
Log:
HADOOP-7568. SequenceFile should not print into stdout. Contributed by Plamen
Jeliazkov.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
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=1169929&r1=1169928&r2=1169929&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
Mon Sep 12 21:17:12 2011
@@ -1080,6 +1080,9 @@ Release 0.22.0 - Unreleased
HADOOP-7390. VersionInfo not generated properly in git after unsplit. (todd
via atm)
+HADOOP-7568. SequenceFile should not print into stdout.
+(Plamen Jeliazkov via shv)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java?rev=1169929&r1=1169928&r2=1169929&view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
Mon Sep 12 21:17:12 2011
@@ -1668,7 +1668,6 @@ public class SequenceFile {
try {
seek(start);
this.end = this.in.getPos() + length;
-System.out.println("Setting end to " + end);
// if it wrapped around, use the max
if (end < length) {
end = Long.MAX_VALUE;
svn commit: r1169925 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/io/SequenceFile.java
Author: shv
Date: Mon Sep 12 21:04:51 2011
New Revision: 1169925
URL: http://svn.apache.org/viewvc?rev=1169925&view=rev
Log:
HADOOP-7568. SequenceFile should not print into stdout. Contributed by Plamen
Jeliazkov.
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/io/SequenceFile.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=1169925&r1=1169924&r2=1169925&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Sep
12 21:04:51 2011
@@ -1090,6 +1090,9 @@ Release 0.22.0 - Unreleased
HADOOP-7390. VersionInfo not generated properly in git after unsplit. (todd
via atm)
+HADOOP-7568. SequenceFile should not print into stdout.
+(Plamen Jeliazkov via shv)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java?rev=1169925&r1=1169924&r2=1169925&view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
Mon Sep 12 21:04:51 2011
@@ -1668,7 +1668,6 @@ public class SequenceFile {
try {
seek(start);
this.end = this.in.getPos() + length;
-System.out.println("Setting end to " + end);
// if it wrapped around, use the max
if (end < length) {
end = Long.MAX_VALUE;
svn commit: r1169696 - /hadoop/common/trunk/dev-support/test-patch.sh
Author: vinodkv
Date: Mon Sep 12 11:22:38 2011
New Revision: 1169696
URL: http://svn.apache.org/viewvc?rev=1169696&view=rev
Log:
MAPREDUCE-2978. Fixed test-patch to make Jenkins report findbugs warnings
properly. Contributed by Tom White.
Modified:
hadoop/common/trunk/dev-support/test-patch.sh
Modified: hadoop/common/trunk/dev-support/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/dev-support/test-patch.sh?rev=1169696&r1=1169695&r2=1169696&view=diff
==
--- hadoop/common/trunk/dev-support/test-patch.sh (original)
+++ hadoop/common/trunk/dev-support/test-patch.sh Mon Sep 12 11:22:38 2011
@@ -566,8 +566,10 @@ checkFindbugsWarnings () {
$FINDBUGS_HOME/bin/convertXmlToText -html \
$PATCH_DIR/newPatchFindbugsWarnings${module_suffix}.xml \
$PATCH_DIR/newPatchFindbugsWarnings${module_suffix}.html
-JIRA_COMMENT_FOOTER="Findbugs warnings:
$BUILD_URL/artifact/trunk/patchprocess/newPatchFindbugsWarnings${module_suffix}.html
+if [[ $newFindbugsWarnings > 0 ]] ; then
+ JIRA_COMMENT_FOOTER="Findbugs warnings:
$BUILD_URL/artifact/trunk/$(basename
$BASEDIR)/patchprocess/newPatchFindbugsWarnings${module_suffix}.html
$JIRA_COMMENT_FOOTER"
+fi
done
### if current warnings greater than OK_FINDBUGS_WARNINGS
svn commit: r1169693 - in /hadoop/common/branches/branch-0.20-security-205: CHANGES.txt build.xml ivy/libraries.properties
Author: mattf Date: Mon Sep 12 11:15:57 2011 New Revision: 1169693 URL: http://svn.apache.org/viewvc?rev=1169693&view=rev Log: Preparing for release 0.20.205.0 Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt hadoop/common/branches/branch-0.20-security-205/build.xml hadoop/common/branches/branch-0.20-security-205/ivy/libraries.properties Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1169693&r1=1169692&r2=1169693&view=diff == --- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Mon Sep 12 11:15:57 2011 @@ -1,6 +1,6 @@ Hadoop Change Log -Release 0.20.205.0 - unreleased +Release 0.20.205.0 - 2011.09.12 NEW FEATURES Modified: hadoop/common/branches/branch-0.20-security-205/build.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/build.xml?rev=1169693&r1=1169692&r2=1169693&view=diff == --- hadoop/common/branches/branch-0.20-security-205/build.xml (original) +++ hadoop/common/branches/branch-0.20-security-205/build.xml Mon Sep 12 11:15:57 2011 @@ -28,7 +28,7 @@ - + Modified: hadoop/common/branches/branch-0.20-security-205/ivy/libraries.properties URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/ivy/libraries.properties?rev=1169693&r1=1169692&r2=1169693&view=diff == --- hadoop/common/branches/branch-0.20-security-205/ivy/libraries.properties (original) +++ hadoop/common/branches/branch-0.20-security-205/ivy/libraries.properties Mon Sep 12 11:15:57 2011 @@ -14,7 +14,7 @@ #It drives ivy and the generation of a maven POM # This is the version of hadoop we are generating -hadoop.version=0.20.206.0 +hadoop.version=0.20.205.0 hadoop-gpl-compression.version=0.1.0 #These are the versions of our dependencies (in alphabetical order)
svn commit: r1169689 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt build.xml ivy/libraries.properties
Author: mattf Date: Mon Sep 12 11:08:04 2011 New Revision: 1169689 URL: http://svn.apache.org/viewvc?rev=1169689&view=rev Log: Preparing for 0.20.206 development Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt hadoop/common/branches/branch-0.20-security/build.xml hadoop/common/branches/branch-0.20-security/ivy/libraries.properties Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1169689&r1=1169688&r2=1169689&view=diff == --- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Mon Sep 12 11:08:04 2011 @@ -1,5 +1,13 @@ Hadoop Change Log +Release 0.20.206.0 - unreleased + + NEW FEATURES + + BUG FIXES + + IMPROVEMENTS + Release 0.20.205.0 - unreleased NEW FEATURES Modified: hadoop/common/branches/branch-0.20-security/build.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/build.xml?rev=1169689&r1=1169688&r2=1169689&view=diff == --- hadoop/common/branches/branch-0.20-security/build.xml (original) +++ hadoop/common/branches/branch-0.20-security/build.xml Mon Sep 12 11:08:04 2011 @@ -28,7 +28,7 @@ - + Modified: hadoop/common/branches/branch-0.20-security/ivy/libraries.properties URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/ivy/libraries.properties?rev=1169689&r1=1169688&r2=1169689&view=diff == --- hadoop/common/branches/branch-0.20-security/ivy/libraries.properties (original) +++ hadoop/common/branches/branch-0.20-security/ivy/libraries.properties Mon Sep 12 11:08:04 2011 @@ -14,7 +14,7 @@ #It drives ivy and the generation of a maven POM # This is the version of hadoop we are generating -hadoop.version=0.20.206.0 +hadoop.version=0.20.207.0 hadoop-gpl-compression.version=0.1.0 #These are the versions of our dependencies (in alphabetical order)
svn commit: r1169684 - /hadoop/common/branches/branch-0.20-security-205/
Author: mattf Date: Mon Sep 12 10:58:11 2011 New Revision: 1169684 URL: http://svn.apache.org/viewvc?rev=1169684&view=rev Log: Branching for 0.20.205 releases Added: hadoop/common/branches/branch-0.20-security-205/ (props changed) - copied from r1169683, hadoop/common/branches/branch-0.20-security/ Propchange: hadoop/common/branches/branch-0.20-security-205/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 12 10:58:11 2011 @@ -0,0 +1,9 @@ +build +build.properties +logs +.classpath +.git +.project +.settings +.launches +.externalToolBuilders Propchange: hadoop/common/branches/branch-0.20-security-205/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Sep 12 10:58:11 2011 @@ -0,0 +1,6 @@ +/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225 +/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329 +/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115 +/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413 +/hadoop/core/branches/branch-0.19:713112 +/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
