Commit Graph

19 Commits

Author SHA1 Message Date
Thomas Graves 5ecf46efb6 merge -r 1359398:1359399 from trunk. FIXES: MAPREDUCE-4300
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359400 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 21:10:09 +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
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
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 461b330ebf svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:48:20 +00:00
Robert Joseph Evans 18a6e47b98 svn merge -c 1309108 from trunk. FIXES MAPREDUCE-3999. Tracking link gives an error if the AppMaster hasn't started yet (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 19:38:43 +00:00
Arun Murthy 3e8925aa92 Changed version in branch-2 to 2.0.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:25:51 +00:00
Arun Murthy 991b24ea34 Merge -c 1296878 from trunk to branch-0.23 to fix MAPREDUCE-3960. Fix web-proxy to forward request to AM with configured hostname or IP.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296880 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 21:15:54 +00:00
Arun Murthy 66d7ab2789 Merge -c 1295314 from trunk to branch-0.23 to fix MAPREDUCE-3706. Fix circular redirect error in job-attempts page.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295315 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 22:16:05 +00:00
Robert Joseph Evans cb6f468ddf svn merge -c 1295147 trunk to branch 23 FIXES MAPREDUCE-3687. If AM dies before it returns new tracking URL, proxy redirects to http://N/A/ and doesn't return error code (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295149 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 15:21:20 +00:00
Arun Murthy c79ae7a8db Moving branch-0.23 to version 0.23.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293515 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:58:06 +00:00
Arun Murthy 78971a4267 Set version to 0.23.2-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241808 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 08:12:18 +00:00
Mahadev Konar d0b1cd9b7e MAPREDUCE-3702 and MAPREDUCE-3691 - merging r1234991 and r1234989 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234994 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 21:27:19 +00:00
Alejandro Abdelnur e3e457398e Merge -r 1227786:1227787 from trunk to branch. FIXES: HADOOP-7934
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227805 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:06:52 +00:00
Vinod Kumar Vavilapalli 84138f3864 MAPREDUCE-3387. Fixed AM's tracking URL to always go through the proxy, even before the job started, so that it works properly with oozie throughout the job execution. Contributed by Robert Joseph Evans.
svn merge -c 1215345 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215347 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 23:42:56 +00:00
Arun Murthy fbfe1b0afa Changing branch-0.23 to 0.23.1-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205240 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 23:47:40 +00:00
Alejandro Abdelnur 0eba9bcc06 Merge -r 1180282:1180283 from trunk to branch. FIXES: MAPREDUCE-3003
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190643 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 22:36:55 +00:00
Vinod Kumar Vavilapalli 4fbaa0ff46 MAPREDUCE-3296. Fixed the remaining nine FindBugs warnings. (vinodkv)
svn merge -c r1190187 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190188 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 07:46:21 +00:00
Arun Murthy b211fc72cc Merge -c 1189036 from trunk to branch-0.23 to fix for MAPREDUCE-2858.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189037 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 06:32:26 +00:00