Commit Graph

839 Commits

Author SHA1 Message Date
Thomas Graves 22d23a4d0f merge -r 1352637:1352638 from trunk. FIXES: MAPREDUCE-4295
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352639 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 18:15:13 +00:00
Thomas Graves 2d734774a1 merge -r 1352549:1352550 from trunk. FIXES: MAPREDUCE-4320
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352551 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 15:02:16 +00:00
Robert Joseph Evans f63255faec svn merge -c 1352330. FIXES: MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352335 13f79535-47bb-0310-9956-ffa450edef68
2012-06-20 21:32:21 +00:00
Siddharth Seth 3b61e3693f Merge MAPREDUCE-4306 from trunk. Fix distributed shell to work with users other than the one running the daemons. (Contributed by Ahmed Radwan)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351878 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 22:02:48 +00:00
Siddharth Seth 27bbcc4c5c Merge MAPREDUCE-4270 from trunk. Move the data_join test classes to the correct path. (Contributed by Thomas Graves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351870 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 21:54:00 +00:00
Robert Joseph Evans c30a4d6a90 svn merge -c 1351818. FIXESL MAPREDUCE-4267. mavenize pipes (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351825 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 20:00:35 +00:00
Thomas Graves 234f1a7ab7 merge -r 1351761:1351762 from trunk. FIXES: MAPREDUCE-4341
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351764 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 16:18:08 +00:00
Thomas Graves daf8c54e66 merge -r 1351699:1351700 from trunk. FIXES: MAPREDUCE-4311
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351703 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 13:08:20 +00:00
Uma Maheswara Rao G 0b32101511 Merge r:1349466 HDFS-3389. Document the BKJM usage in Namenode HA. Contributed by Uma Maheswara Rao G and Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349469 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 18:27:01 +00:00
Siddharth Seth 2846979f16 Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 23:16:08 +00:00
Thomas White f323ea705d Merge -r 1348996:1348997 from trunk to branch-2. Fixes: MAPREDUCE-3871.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348999 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 20:39:13 +00:00
Alejandro Abdelnur f27f122609 Merge -r 1348956:1348957 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348959 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:44:57 +00:00
Thomas Graves 4159a21d28 merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 13:57:15 +00:00
Thomas Graves d1607ba557 merge -r 1348122:1348123 from trunk. FIXES: MAPREDUCE-3842
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348126 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 15:51:21 +00:00
Todd Lipcon d7e171d5b8 Merge HDFS-3042 (automatic failover) to branch-2 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347804 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 21:25:34 +00:00
Tsz-wo Sze 1156fc41dc svn merge -c -1347094 for reverting HADOOP-8368 again.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347739 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 17:58:19 +00:00
Alejandro Abdelnur bad1c8bdd5 svn merge -c -1346495 for re-committing HADOOP-8368. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347094 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 20:17:33 +00:00
Vinod Kumar Vavilapalli cb4b43b37e MAPREDUCE-3873. Fixed NodeManagers' decommissioning at RM to accept IP addresses also. Contributed by xieguiming and vinodkv.
svn merge --ignore-ancestry -c 1346671 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346673 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 23:55:46 +00:00
Tsz-wo Sze b93758626e svn revert -c -1346102 for reverting HADOOP-8368.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346495 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 18:00:44 +00:00
Robert Joseph Evans eb7df250ca svn merge -c 1346406. FIXES: MAPREDUCE-4313. TestTokenCache doesn't compile due TokenCache.getDelegationToken compilation error (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346409 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 15:09:56 +00:00
Eli Collins 068b62b9a3 Updated CHANGES.txt files to reflect the 2.0.0-alpha release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346151 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 20:54:17 +00:00
Alejandro Abdelnur 36c8624924 Merge -r 1345420:1345421 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346102 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 19:34:57 +00:00
Thomas Graves ddef6a062e merge -r 1346064:1346065 from trunk. FIXES: MAPREDUCE-3350
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346068 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 18:06:58 +00:00
Thomas Graves 3dc10a25d9 merge -r 1346046:1346047 from trunk. FIXES: MAPREDUCE-3350
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346048 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 17:42:45 +00:00
Thomas Graves c59349ede3 merge -r 1346001:1346002 from trunk. FIXES: MAPREDUCE-4301
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346003 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 15:15:13 +00:00
Eli Collins 8960db7605 HADOOP-8450. Remove src/test/system. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345795 13f79535-47bb-0310-9956-ffa450edef68
2012-06-03 22:21:06 +00:00
Eli Collins 026a285d52 MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize() without a Path - Failure when using ViewFileSystem. Contributed by Ahmed Radwan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345552 13f79535-47bb-0310-9956-ffa450edef68
2012-06-02 18:50:50 +00:00
Robert Joseph Evans 5e8a982209 svn merge -c 1345362. FIXES: MAPREDUCE-4302. NM goes down if error encountered during log aggregation (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345363 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 21:56:04 +00:00
Robert Joseph Evans 0bed0fec3c svn merge -c 1345304. FIXES: HADOOP-8460. Document proper setting of HADOOP_PID_DIR and HADOOP_SECURE_DN_PID_DIR (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345306 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 18:19:02 +00:00
Robert Joseph Evans f376251475 svn merge -c 1344763 FIXES: MAPREDUCE-4297. Usersmap file in gridmix should not fail on empty lines (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344764 13f79535-47bb-0310-9956-ffa450edef68
2012-05-31 15:17:39 +00:00
Robert Joseph Evans ed20ba2e49 svn merge -c 1344283. FIXES: MAPREDUCE-4152. map task left hanging after AM dies trying to connect to RM (Tom Graves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344288 13f79535-47bb-0310-9956-ffa450edef68
2012-05-30 14:52:39 +00:00
Harsh J 4200fa906e svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 16:15:25 +00:00
Thomas White 5e473c9c6e Merge -r 1343754:1343755 from trunk to branch-2. Fixes: MAPREDUCE-4146
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343756 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:45:25 +00:00
Harsh J 1f804b5d20 svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:58:13 +00:00
Thomas Graves 02a703fac2 merge -r 1342243:1342244 from trunk. FIXES: MAPREDUCE-4224
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342245 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 13:17:08 +00:00
Alejandro Abdelnur 897314775b Merge -r 1342074:1342075 from trunk to branch. FIXES: MAPREDUCE-4276
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342076 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 22:23:50 +00:00
Thomas Graves f57e335252 merge -r 1341971:1341972 from trunk. FIXES: MAPREDUCE-4262
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341973 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 18:38:23 +00:00
Thomas Graves 0a0c649c86 merge -r 1341159:1341160 from trunk. FIXES: MAPREDUCE-3870
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341162 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 19:22:49 +00:00
Robert Joseph Evans 1586e827ed i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 19:07:13 +00:00
Thomas Graves 1c65990dae merge -r 1340879:1340880 from trunk. FIXES: MAPREDUCE-4269
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340881 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 01:57:21 +00:00
Eli Collins 619cc6a775 HDFS-2885. Remove "federation" from the nameservice config options. Contributed by Tsz Wo (Nicholas), SZE
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340842 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 21:15:16 +00:00
Todd Lipcon 58f72f035f MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not from default file system. Contributed by Bhallamudi Venkata Siva Kamesh.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340629 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 07:41:37 +00:00
Thomas Graves 297cbcca27 merge -r 1339956:1339957 from trunk. FIXES: MAPREDUCE-4197
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339958 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 02:51:56 +00:00
Thomas Graves b35de62e1d MAPREDUCE-3543. Mavenize Gridmix. (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339652 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 15:31:19 +00:00
Alejandro Abdelnur 00875b37f6 HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 19:46:30 +00:00
Thomas Graves a1ce7813e9 merge -r 1339173:1339174 from trunk. FIXES: MAPREDUCE-4102
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339177 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 14:10:35 +00:00
Todd Lipcon 73766e6d1d Move changes from 2.0.0-alpha to 2.0.1-alpha in CHANGES.txt for those that did not make rc1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339017 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 05:44:01 +00:00
Alejandro Abdelnur e8ea3fdb52 Merge -r 1338999:1339000 from trunk to branch. FIXES: MAPREDUCE-4250
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339002 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 04:16:37 +00:00
Thomas Graves c993d1bac5 merge -r 1338834:1338835 from trunk. FIXES: MAPREDUCE-4238
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338841 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 19:15:43 +00:00
Tsz-wo Sze a5da2f6d68 Merge r1329319 for HADOOP-8285 for the changes outside common.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337433 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 02:19:58 +00:00