Commit Graph

809 Commits

Author SHA1 Message Date
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
Robert Joseph Evans 5922f4f064 svn merge -c 1337363 FIXES: MAPREDUCE-4233. NPE can happen in RMNMNodeInfo. (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337364 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 20:27:58 +00:00
Aaron Myers 35b27ae3f5 HADOOP-8353. hadoop-daemon.sh and yarn-daemon.sh can be misleading on stop. Contributed by Roman Shaposhnik.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337252 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 16:16:55 +00:00
Thomas White dc576b9fa1 Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337200 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 15:04:24 +00:00
Tsz-wo Sze b41b4e9c43 svn merge -c 1336909 from trunk for HDFS-3369. Rename {get|set|add}INode(..) methods in BlockManager and BlocksMap to {get|set|add}BlockCollection(..).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336911 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 21:45:45 +00:00
Robert Joseph Evans 00f0379a54 svn merge -c 1336399. FIXES: MAPREDUCE-4237. TestNodeStatusUpdater can fail if localhost has a domain associated with it (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336401 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 21:10:02 +00:00
Tsz-wo Sze 8a99480f44 svn merge -c 1335661 from trunk for MAPREDUCE-4231.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335662 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 17:57:07 +00:00
Thomas Graves 9b6535579e merge -r 1335646:1335647 from trunk. FIXES: MAPREDUCE-4215
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335648 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 17:14:43 +00:00
Robert Joseph Evans c35e442b1b svn merge -c 1335585 FIXES: MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335587 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:26:11 +00:00
Robert Joseph Evans 4bc2774d79 svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335569 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:10:03 +00:00
Thomas White f1e31ebaf2 Merge -r 1335196:1335197 from trunk to branch-2. Fixes: MAPREDUCE-4226
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335198 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 19:07:29 +00:00
Robert Joseph Evans e54add89a8 svn merge -c 1335096 FIXES: MAPREDUCE-4220. RM apps page starttime/endtime sorts are incorrect (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335098 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 16:19:34 +00:00
Robert Joseph Evans 95a0505c60 svn merge -c 1334043. FIXES: MAPREDUCE-3958. RM: Remove RMNodeState and replace it with NodeState (Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334045 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 15:48:13 +00:00
Robert Joseph Evans 13acee63d3 svn merge -c 1334013 FIXES: MAPREDUCE-4048. NullPointerException exception while accessing the Application Master UI (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334014 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 15:04:08 +00:00
Alejandro Abdelnur 9a04fc6caf Merge -r 1333747:1333748 from trunk to branch. FIXES: MAPREDUCE-4205
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333749 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:21:15 +00:00
Robert Joseph Evans c9aac0a1d1 svn merge -c 1333579 FIXES: MAPREDUCE-4163. consistently set the bind address (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333580 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 18:37:01 +00:00
Alejandro Abdelnur d5defb5e60 Merge -r 1333240:1333241 from trunk to branch. FIXES: MAPREDUCE-4219
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333242 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 22:54:36 +00:00
Robert Joseph Evans 611dffafc7 svn merge -c 1333144 FIXES: MAPREDUCE-4210. Expose listener address for WebApp (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333145 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 18:28:13 +00:00
Robert Joseph Evans 76cc94f43f svn merge -c 1333063 FIXES: MAPREDUCE-3173. MRV2 UI doesn't work properly without internet (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333066 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 14:44:10 +00:00
Robert Joseph Evans 007878d3e2 MAPREDUCE-4202. Updating changes to just be branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332728 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 16:13:53 +00:00
Robert Joseph Evans 5765eb1868 svn merge -c 1332716. FIXES: MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332719 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 16:02:31 +00:00
Robert Joseph Evans 848a2026f2 svn merge -c 1332701 FIXES: MAPREDUCE-4211. Error conditions (missing appid, appid not found) are masked in the RM app page (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332703 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 15:36:09 +00:00
Thomas Graves 1a17df6b21 merge -r 1332664:1332665 from trunk. FIXES: MAPREDUCE-4212
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332667 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 14:11:31 +00:00
Thomas Graves 41ce1fa860 merge -r 1332231:1332232 from trunk. FIXES: MAPREDUCE-4206
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332235 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 15:08:30 +00:00
Robert Joseph Evans f17cf45efe svn merge -c 1332226. FIXES: MAPREDUCE-4209. junit dependency in hadoop-mapreduce-client is missing scope test (Radim Kolar via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332227 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 14:49:43 +00:00
Thomas Graves 0b6d455dc8 merge -r 1332195:1332196 from trunk. FIXES: MAPREDUCE-3883
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332198 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 13:44:12 +00:00
Robert Joseph Evans da0f9645a0 svn merge -c 1331046. FIXES: MAPREDUCE-4189. TestContainerManagerSecurity is failing (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331048 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 19:44:22 +00:00
Thomas White e5e15fab74 Merge -r 1331022:1331023 from trunk to branch-2. Fixes: MAPREDUCE-4138
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331029 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 18:48:13 +00:00
Robert Joseph Evans 0f0204c3c2 svn merge -c 1331012. FIXES: MAPREDUCE-4169. Container Logs appear in unsorted order (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331014 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 18:28:18 +00:00
Thomas Graves bb9cfbb052 merge -r 1330559:1330560 from trunk. FIXES: MAPREDUCE-3613
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330561 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 21:14:13 +00:00
Robert Joseph Evans 7f40acc947 svn merge -c 1330552 FIXES: MAPREDUCE-4194. ConcurrentModificationError in DirectoryCollection (Jonathan Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330555 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 20:53:15 +00:00