hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1162279 [2/2] - in /hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project: ./ .eclipse.templates/ .eclipse.templates/.launches/ assembly/ bin/ conf/ dev-support/ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-...
Date Fri, 26 Aug 2011 22:48:46 GMT

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,10 @@
+build
+build.properties
+ivy/ivy-*.jar
+logs
+.classpath
+.externalToolBuilders
+.launches
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,2 @@
+/hadoop/common/trunk/hadoop-mapreduce-project:1152502-1162221
+/hadoop/core/branches/branch-0.19/mapred:713112

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,13 @@
+masters
+slaves
+hadoop-env.sh
+hadoop-site.xml
+core-site.xml
+mapred-site.xml
+hdfs-site.xml
+hadoop-policy.xml
+capacity-scheduler.xml
+fair-scheduler.xml
+mapred-queue-acls.xml
+mapred-queues.xml
+

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/conf:1152502-1162221
+/hadoop/core/branches/branch-0.19/mapred/conf:713112
+/hadoop/core/trunk/conf:784664-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Modified: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/scripts/saveVersion.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/scripts/saveVersion.sh?rev=1162279&r1=1162221&r2=1162279&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/scripts/saveVersion.sh
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/scripts/saveVersion.sh
Fri Aug 26 22:46:17 2011
@@ -34,7 +34,7 @@ if git rev-parse HEAD 2>/dev/null > /dev
   url="git://${hostname}${cwd}"
 elif [ -d .svn ]; then
   revision=`svn info ../ | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
-  url=`svn info ../ | sed -n -e 's/URL: \(.*\)/\1/p'`
+  url=`svn info ../ | sed -n -e 's/^URL: \(.*\)/\1/p'`
   # Get canonical branch (branches/X, tags/X, or trunk)
   branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \
                              -e 's,.*\(tags/.*\)$,\1,p' \

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/ivy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1 @@
+ivy-*.jar

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/c++:1159757-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/c++:713112
+/hadoop/core/trunk/src/c++:776175-784663

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib:1152502-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
+/hadoop/core/trunk/src/contrib:784664-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics:1152502-1162221
+/hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
+/hadoop/core/branches/branch-0.19/mapred/src/contrib/block_forensics:713112
+/hadoop/core/trunk/src/contrib/block_forensics:784664-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/capacity-scheduler:1159757-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112
+/hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/capacity-scheduler/src/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1 @@
+mapred-queues.xml

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join:1159757-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
+/hadoop/core/trunk/src/contrib/data_join:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/dynamic-scheduler:1159757-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/contrib/dynamic-scheduler:713112
+/hadoop/core/branches/branch-0.19/src/contrib/dynamic-scheduler:713112
+/hadoop/core/trunk/src/contrib/dynamic-scheduler:784664-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin:1159757-1162221
+/hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
+/hadoop/core/branches/branch-0.19/mapred/src/contrib/eclipse-plugin:713112
+/hadoop/core/trunk/src/contrib/eclipse-plugin:776175-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/fairscheduler:1159757-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/contrib/fairscheduler:713112
+/hadoop/core/trunk/src/contrib/fairscheduler:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index:1159757-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
+/hadoop/core/trunk/src/contrib/index:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/index/conf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1 @@
+index-config.xml

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/streaming:1159757-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/contrib/streaming:713112
+/hadoop/core/trunk/src/contrib/streaming:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya:1159757-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
+/hadoop/core/trunk/src/contrib/vaidya:776175-786373

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/docs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 22:46:17 2011
@@ -0,0 +1 @@
+build

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/examples:1152502-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/examples:713112
+/hadoop/core/trunk/src/examples:776175-784663

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/java:1152502-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/java:713112
+/hadoop/core/trunk/src/mapred:776175-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Fri Aug 26 22:46:17 2011
@@ -0,0 +1 @@
+bin https://svn.apache.org/repos/asf/hadoop/common/trunk/common/src/test/bin

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred:1152502-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
+/hadoop/core/trunk/src/test/mapred:776175-785643

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:1159757-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112
+/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,4 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:1152502-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112
+/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,6 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:1159757-1162221
+/hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs-with-mr/org/apache/hadoop/ipc:713112
+/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/ipc:713112
+/hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663
+/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/ipc:776175-785643
+/hadoop/hdfs/branches/HDFS-265/src/test/hdfs-with-mr/org/apache/hadoop/ipc:796829-820463

Propchange: hadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 22:46:17 2011
@@ -0,0 +1,3 @@
+/hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job:1152502-1162221
+/hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
+/hadoop/core/trunk/src/webapps/job:776175-785643



Mime
View raw message