svn commit: r1212835 - in /hadoop/common/branches/branch-1: CHANGES.txt src/core/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
Author: eli
Date: Sat Dec 10 18:19:00 2011
New Revision: 1212835
URL: http://svn.apache.org/viewvc?rev=1212835view=rev
Log:
HADOOP-7898. Fix javadoc warnings in AuthenticationToken.java. Contributed by
Suresh Srinivas
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1212835r1=1212834r2=1212835view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sat Dec 10 18:19:00 2011
@@ -63,6 +63,9 @@ Release 1.1.0 - unreleased
MAPREDUCE-3319. Hadoop example multifilewc broken in 0.20.205.0.
(Subroto Sanyal via mattf)
+HADOOP-7898. Fix javadoc warnings in AuthenticationToken.java.
+(suresh via eli)
+
IMPROVEMENTS
MAPREDUCE-3008. [Gridmix] Improve cumulative CPU usage emulation for
Modified:
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/authentication/server/AuthenticationToken.java?rev=1212835r1=1212834r2=1212835view=diff
==
---
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
(original)
+++
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
Sat Dec 10 18:19:00 2011
@@ -23,12 +23,16 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
+import javax.servlet.http.HttpServletRequest;
+
/**
- * The {@link AuthenticationToken} contains information about an authenticated
HTTP client and doubles
- * as the {@link Principal} to be returned by authenticated {@link
HttpServletRequest}s
+ * The {@link AuthenticationToken} contains information about an authenticated
+ * HTTP client and doubles as the {@link Principal} to be returned by
+ * authenticated {@link HttpServletRequest}s
* p/
- * The token can be serialized/deserialized to and from a string as it is sent
and received in HTTP client
- * responses and requests as a HTTP cookie (this is done by the {@link
AuthenticationFilter}).
+ * The token can be serialized/deserialized to and from a string as it is sent
+ * and received in HTTP client responses and requests as a HTTP cookie (this is
+ * done by the {@link AuthenticationFilter}).
*/
public class AuthenticationToken implements Principal {
svn commit: r1212837 - in /hadoop/common/branches/branch-0.23: ./ hadoop-project/src/site/
Author: eli Date: Sat Dec 10 18:25:57 2011 New Revision: 1212837 URL: http://svn.apache.org/viewvc?rev=1212837view=rev Log: HADOOP-7898. svn merge -c 1212021 from trunk Modified: hadoop/common/branches/branch-0.23/ (props changed) hadoop/common/branches/branch-0.23/hadoop-project/src/site/ (props changed) Propchange: hadoop/common/branches/branch-0.23/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Dec 10 18:25:57 2011 @@ -1 +1 @@ -/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204370,1204376,1204388,1205260,1206786,1206830,1207694,1208153,1208313,1212062,1212073,1212084 +/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204370,1204376,1204388,1205260,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084 Propchange: hadoop/common/branches/branch-0.23/hadoop-project/src/site/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Dec 10 18:25:57 2011 @@ -1 +1 @@ -/hadoop/common/trunk/hadoop-project/src/site:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204370,1204376,1204388,1205260,1205626,1206786,1206830,1207694,1208153,1208313,1212062,1212073,1212084 +/hadoop/common/trunk/hadoop-project/src/site:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204370,1204376,1204388,1205260,1205626,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084
svn commit: r1212837 - in /hadoop/common/branches/branch-0.23/hadoop-common-project: ./ hadoop-auth/ hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/ hadoop-common/ hadoop-c
Author: eli
Date: Sat Dec 10 18:25:57 2011
New Revision: 1212837
URL: http://svn.apache.org/viewvc?rev=1212837view=rev
Log:
HADOOP-7898. svn merge -c 1212021 from trunk
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/
(props changed)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/
(props changed)
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/docs/
(props changed)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Propchange: hadoop/common/branches/branch-0.23/hadoop-common-project/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 10 18:25:57 2011
@@ -1 +1 @@
-/hadoop/common/trunk/hadoop-common-project:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167383,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204370,1204376,1204388,1205260,1206786,1206830,1207694,1208153,1208313,1212062,1212073,1212084
+/hadoop/common/trunk/hadoop-common-project:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167383,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204370,1204376,1204388,1205260,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084
Propchange:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 10 18:25:57 2011
@@ -1 +1 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-auth:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166402,1167383,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1179869,1189357,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204370,1204376,1204388,1205260,1206786,1206830,1207694,1208153,1208313,1212062,1212073,1212084
+/hadoop/common/trunk/hadoop-common-project/hadoop-auth:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166402,1167383,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1179869,1189357,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204370,1204376,1204388,1205260,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java?rev=1212837r1=1212836r2=1212837view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java
Sat Dec 10 18:25:57 2011
@@ -23,12 +23,16 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
+import javax.servlet.http.HttpServletRequest;
+
/**
- * The {@link AuthenticationToken} contains information about an authenticated
HTTP client and doubles
- * as the {@link Principal} to be returned by authenticated {@link
HttpServletRequest}s
+ * The {@link AuthenticationToken} contains information about an authenticated
+ * HTTP client and doubles as the {@link Principal} to be returned by
+ * authenticated {@link HttpServletRequest}s
* p/
-
svn commit: r1212838 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: eli Date: Sat Dec 10 18:27:40 2011 New Revision: 1212838 URL: http://svn.apache.org/viewvc?rev=1212838view=rev Log: Fixup changelog for HADOOP-7898 Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 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=1212838r1=1212837r2=1212838view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Sat Dec 10 18:27:40 2011 @@ -131,9 +131,6 @@ Trunk (unreleased changes) HADOOP-7897. ProtobufRpcEngine client side exception mechanism is not consistent with WritableRpcEngine. (suresh) -HADOOP-7898. Fix javadoc warnings in AuthenticationToken.java. -(suresh) - HADOOP-7902. skipping name rules setting (if already set) should be done on UGI initialization only. (tucu) @@ -198,6 +195,8 @@ Release 0.23.1 - Unreleased HADOOP-7870. fix SequenceFile#createWriter with boolean createParent arg to respect createParent. (Jon Hsieh via eli) + HADOOP-7898. Fix javadoc warnings in AuthenticationToken.java. (suresh) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES
svn commit: r1212839 - in /hadoop/common/branches/branch-1: CHANGES.txt src/core/org/apache/hadoop/io/SequenceFile.java src/core/org/apache/hadoop/util/ChecksumUtil.java src/mapred/org/apache/hadoop/m
Author: eli
Date: Sat Dec 10 18:32:16 2011
New Revision: 1212839
URL: http://svn.apache.org/viewvc?rev=1212839view=rev
Log:
HADOOP-7908. Fix three javadoc warnings on branch-1. Contributed by Eli Collins
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/io/SequenceFile.java
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/ChecksumUtil.java
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/QueueAclsInfo.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1212839r1=1212838r2=1212839view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sat Dec 10 18:32:16 2011
@@ -66,6 +66,8 @@ Release 1.1.0 - unreleased
HADOOP-7898. Fix javadoc warnings in AuthenticationToken.java.
(suresh via eli)
+HADOOP-7908. Fix three javadoc warnings on branch-1. (eli)
+
IMPROVEMENTS
MAPREDUCE-3008. [Gridmix] Improve cumulative CPU usage emulation for
Modified:
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/io/SequenceFile.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/io/SequenceFile.java?rev=1212839r1=1212838r2=1212839view=diff
==
---
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/io/SequenceFile.java
(original)
+++
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/io/SequenceFile.java
Sat Dec 10 18:32:16 2011
@@ -419,7 +419,6 @@ public class SequenceFile {
* @param createParent create parent directory if non-existent
* @param compressionType The compression type.
* @param codec The compression codec.
- * @param progress The Progressable object to track progress.
* @param metadata The metadata of the file.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
Modified:
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/ChecksumUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/ChecksumUtil.java?rev=1212839r1=1212838r2=1212839view=diff
==
---
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/ChecksumUtil.java
(original)
+++
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/ChecksumUtil.java
Sat Dec 10 18:32:16 2011
@@ -25,7 +25,7 @@ public class ChecksumUtil {
* updates the checksum for a buffer
*
* @param buf - buffer to update the checksum in
- * @param chunkOff - offset in the buffer where the checksum is to update
+ * @param checksumOff - offset in the buffer where the checksum is to update
* @param dataOff - offset in the buffer of the data
* @param dataLen - length of data to compute checksum on
*/
Modified:
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/QueueAclsInfo.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/QueueAclsInfo.java?rev=1212839r1=1212838r2=1212839view=diff
==
---
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/QueueAclsInfo.java
(original)
+++
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/QueueAclsInfo.java
Sat Dec 10 18:32:16 2011
@@ -46,7 +46,7 @@ public class QueueAclsInfo implements Wr
* queue operations array
*
* @param queueName Name of the job queue
- * @param queue operations
+ * @param operations queue operations
*
*/
public QueueAclsInfo(String queueName, String[] operations) {
[Hadoop Wiki] Update of DevelopingOnTrunkAfter279Merge by SteveLoughran
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Hadoop Wiki for change
notification.
The DevelopingOnTrunkAfter279Merge page has been changed by SteveLoughran:
http://wiki.apache.org/hadoop/DevelopingOnTrunkAfter279Merge?action=diffrev1=6rev2=7
Comment:
Linux instructions on protoc installation
Hope that helps. If you run into issues, please send an email or create a
JIRA issue.
+ == Building on Linux ==
+
+ Linux distributions may install protocol buffers via their repostories. This
can save all the installation problems, or it can cause extra problems
+
+ # Look in your package manager for any protoc or protocol buffers
compiler and library; check the version.
+ # If the version is 2.4.0 or later, select these and install them.
+ # If the version is below that, do not install them, and uninstall them if
they are present, then follow the installation instructions above.
+
+ Problem: Protoc compiler fails on Linux
+ if you see an error like
+ {{{
+ protoc: error while loading shared libraries: libprotobuf.so.7: cannot open
shared object file: No such file or directory
+ }}}
+ It may be that the installation already has an older copy of protocol buffers
installed, and this is getting in the way of the newly installed version
+
+ Test: run {{{protoc --version}}} to see what version is picked up. Here is
the example of a valid version
+ $ protoc --version
+ libprotoc 2.4.1
+ }}}
+
+ If a version older than 2.4.0 appears, you need to uninstall protoc and
possibly libprotoc using your platform's package management tools.
+
[Hadoop Wiki] Update of Hbase/HowToContribute by SteveLoughran
Dear Wiki user, You have subscribed to a wiki page or wiki category on Hadoop Wiki for change notification. The Hbase/HowToContribute page has been changed by SteveLoughran: http://wiki.apache.org/hadoop/Hbase/HowToContribute?action=diffrev1=98rev2=99 Comment: a bit more cleanup }}} === Making Changes === - Before you start, send a message to the MailTo(dev AT SPAMFREE hbase DOT apache DOT org) HBase developer mailing list, or file a bug report in [[https://issues.apache.org/jira/browse/HBASE|Hbase JIRA]]. Describe your proposed changes and check that they fit in with what others are doing and have planned for the project[[http://setiathome.berkeley.edu/show_user.php?userid=9617312|.]] Be patient, it may take folks a while to understand your requirements. + Before you start, send a message to the MailTo(dev AT SPAMFREE hbase DOT apache DOT org) HBase developer mailing list, or file a bug report in [[https://issues.apache.org/jira/browse/HBASE|Hbase JIRA]]. Describe your proposed changes and check that they fit in with what others are doing and have planned for the project. Be patient, it may take folks a while to understand your requirements. Modify the source code and add some (very) nice features using your favorite IDE.BR @@ -33, +33 @@ * All public classes and methods should have informative [[http://java.sun.com/j2se/javadoc/writingdoccomments/|Javadoc comments]] * Do not use @author tags * Please include the Apache License - * Make sure the tests work before your change, and afterwards. If they were working and then stopped, your change broke something and won't get accepted[[http://mith.umd.edu/tile/forums/profile.php?id=5861|.]] + * Make sure the tests work before your change, and afterwards. If they were working and then stopped, your change broke something and won't get accepted. - * Extra tests are always welcome[[http://qcn.stanford.edu/sensor/show_user.php?userid=31559|.]] + * Extra tests are always welcome. - - [[http://qcn.stanford.edu/sensor/show_user.php?userid=31559|.]] - [[http://scripts.mit.edu/~mitats/forum/profile.php?mode=viewprofileu=11 - - 054|.]] - [[http://sci.rutgers.edu/forum/member.php?u=104150|.]] - [[http://web.ics.purdue.edu/~hksa/forum/phpBB2/profile.php?mode=viewprof - - ileu=16926|.]] - - [[http://marsgeo.astro.cornell.edu/cgi-bin/ikonboard//profile.cgi?action - - =showmember=naefak|.]] - - [[http://www.sc4wda.org.vt.edu/forums/profile.php?mode=viewprofileu=303|.]] - - 6 - [[http://brainmaps.org/forum/profile.php?id=9948|.]] - [[http://boinc.umiacs.umd.edu/show_user.php?userid=43808|.]] - [[http://animage.ucsd.edu/forum/profile.php?id=2249|.]] - [[http://eon.ices.utexas.edu/eon2/show_user.php?userid=7880|.]] -
svn commit: r1212956 - in /hadoop/common/tags/release-0.22.0-rc0: branch-0.22/common/ branch-0.22/hdfs/ branch-0.22/mapreduce/ common/ hdfs/ mapreduce/
Author: shv Date: Sun Dec 11 01:49:46 2011 New Revision: 1212956 URL: http://svn.apache.org/viewvc?rev=1212956view=rev Log: Correcting directory structure for release-0.22.0-rc0 Added: hadoop/common/tags/release-0.22.0-rc0/common/ (props changed) - copied from r1212955, hadoop/common/tags/release-0.22.0-rc0/branch-0.22/common/ hadoop/common/tags/release-0.22.0-rc0/hdfs/ (props changed) - copied from r1212955, hadoop/common/tags/release-0.22.0-rc0/branch-0.22/hdfs/ hadoop/common/tags/release-0.22.0-rc0/mapreduce/ (props changed) - copied from r1212955, hadoop/common/tags/release-0.22.0-rc0/branch-0.22/mapreduce/ Removed: hadoop/common/tags/release-0.22.0-rc0/branch-0.22/common/ hadoop/common/tags/release-0.22.0-rc0/branch-0.22/hdfs/ hadoop/common/tags/release-0.22.0-rc0/branch-0.22/mapreduce/ Propchange: hadoop/common/tags/release-0.22.0-rc0/common/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Dec 11 01:49:46 2011 @@ -0,0 +1,2 @@ +/hadoop/common/trunk/common:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287,1132511 +/hadoop/core/branches/branch-0.19/core/common:713112 Propchange: hadoop/common/tags/release-0.22.0-rc0/hdfs/ -- --- svn:ignore (added) +++ svn:ignore Sun Dec 11 01:49:46 2011 @@ -0,0 +1,8 @@ +build +build-fi +build.properties +logs +.classpath +.externalToolBuilders +.project +.settings Propchange: hadoop/common/tags/release-0.22.0-rc0/hdfs/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Dec 11 01:49:46 2011 @@ -0,0 +1,5 @@ +/hadoop/common/trunk:1096645 +/hadoop/core/branches/branch-0.19/hdfs:713112 +/hadoop/hdfs/branches/HDFS-265:796829-820463 +/hadoop/hdfs/branches/branch-0.21:820487 +/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881 Propchange: hadoop/common/tags/release-0.22.0-rc0/mapreduce/ -- --- svn:ignore (added) +++ svn:ignore Sun Dec 11 01:49:46 2011 @@ -0,0 +1,9 @@ +build +build.properties +ivy/ivy-*.jar +logs +.classpath +.externalToolBuilders +.launches +.project +.settings Propchange: hadoop/common/tags/release-0.22.0-rc0/mapreduce/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Dec 11 01:49:46 2011 @@ -0,0 +1,2 @@ +/hadoop/core/branches/branch-0.19/mapred:713112 +/hadoop/mapreduce/trunk:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908,1103921,1124374
