Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,345 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

211 Commits

Author SHA1 Message Date
Chris Nauroth 658905cd44 MAPREDUCE-5442. Merging change r1529077 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529079 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-04 05:42:58 +00:00
Vinod Kumar Vavilapalli 6daca6a93d MAPREDUCE-5536. Fixed MR AM and JHS to respect mapreduce.jobhistory.webapp.https.address. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1528251 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528253 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-01 22:54:35 +00:00
Jason Darrell Lowe 7e812e7126 svn merge -c 1528237 FIXES: MAPREDUCE-4421. Run MapReduce framework via the distributed cache. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528242 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-01 22:40:01 +00:00
Jason Darrell Lowe d8e9a472e7 svn merge -c 1527015 FIXES: MAPREDUCE-5332. Support token-preserving restart of history server. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527016 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 18:26:09 +00:00
Vinod Kumar Vavilapalli 2daddb610e YARN-1204. Added separate configuration properties for https for RM and NM without which servers enabled with https will also start on http ports. Contributed by Omkar Vinit Joshi. 
MAPREDUCE-5523. Added separate configuration properties for https for JHS without which even when https is enabled, it starts on http port itself. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1525947 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525948 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-24 17:20:48 +00:00
Thomas Graves 11d0fe9722 MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524843 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 21:00:40 +00:00
Arun Murthy c061a0da55 Merge -c 1523652 from trunk to branch-2 to fix YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contributed by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523653 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 14:06:27 +00:00
Vinod Kumar Vavilapalli ba89f8efc7 YARN-1085. Addendum patch to address issues with the earlier patch. 
svn merge --ignore-ancestry -c 1517721 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517722 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-26 23:01:23 +00:00
Chris Nauroth 3ad42fba26 MAPREDUCE-5470. Merging change r1516623 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516625 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 21:43:57 +00:00
Alejandro Abdelnur eee2b37a3a HADOOP-9872. Improve protoc version handling and detection. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514074 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:29:46 +00:00
Alejandro Abdelnur 677bbd336d HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514071 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:25:26 +00:00
Sanford Ryza 2a7293a254 MAPREDUCE-434. LocalJobRunner limited to single reducer (Sandy Ryza and Aaron Kimball via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510867 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-06 06:40:42 +00:00
Sanford Ryza 3490c9aab7 MAPREDUCE-5367. Local jobs all use same local working directory (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510612 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 17:12:58 +00:00
Vinod Kumar Vavilapalli d00dcbd2f5 MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1508595 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508596 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-30 20:05:19 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-19 01:35:34 +00:00
Jason Darrell Lowe 9b1bc20045 svn merge -c 1504645 FIXES: MAPREDUCE-5265. History server admin service to refresh user and superuser group mappings. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504653 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-18 20:47:58 +00:00
Chris Nauroth 0f3bb0567d MAPREDUCE-5359. Merging change r1499153 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499154 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-03 00:01:28 +00:00
Vinod Kumar Vavilapalli 6418929696 YARN-773. Moved YarnRuntimeException from package api.yarn to api.yarn.exceptions. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1492903 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492904 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 23:26:20 +00:00
Vinod Kumar Vavilapalli 6f8b6699bd YARN-724. Moved ProtoBase from api.records to api.records.impl.pb. Contributed by Jian He. 
MAPREDUCE-5303. Changed MR app after moving ProtoBase to package impl.pb via YARN-724. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489658 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489659 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 22:47:05 +00:00
Arun Murthy 27ed92a3fb Set version in branch-2 to 2.2.0-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 15:34:52 +00:00
Vinod Kumar Vavilapalli 5f20c37919 YARN-635. Renamed YarnRemoteException to YarnException. Contributed by Siddharth Seth. 
MAPREDUCE-5301. Updated MR code to work with YARN-635 changes of renaming YarnRemoteException to YarnException. Contributed by Siddharth Seth.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489288 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 04:50:16 +00:00
Vinod Kumar Vavilapalli cafa5d8bb5 YARN-748. Moved BuilderUtils from yarn-common to yarn-server-common for eventual retirement. Contributed by Jian He. 
MAPREDUCE-5297. Updated MR App since BuilderUtils is no longer public after YARN-748. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489257 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489262 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 00:56:26 +00:00
Arun Murthy 6edd290758 Merge -c 1489227 from trunk to branch-2 to fix MAPREDUCE-5300. Fix backward incompatibility for o.a.h.mapreduce.filecache.DistributedCache. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489228 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 23:43:14 +00:00
Siddharth Seth f42fc8f958 merge YARN-720 and MAPREDUCE-5291 from trunk. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488830 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 02:36:44 +00:00
Vinod Kumar Vavilapalli 41ed12124c YARN-717. Put object creation factories for Token in the class itself and remove useless derivations for specific tokens. Contributed by Jian He. 
MAPREDUCE-5289. Updated MR App to use Token directly after YARN-717. Contributed by Jian He.
svn merge --ignore-ancestry -c 1488616 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488617 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 21:45:24 +00:00
Konstantin Boudnik 6e0b55c5b7 Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:41 +00:00
Vinod Kumar Vavilapalli a099537780 YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth. 
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1487994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487995 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 20:19:53 +00:00
Vinod Kumar Vavilapalli 6cb1cf3d1a MAPREDUCE-5263. Bring back old methods and fields in filecache.DistributedCache for binary compatibility with mapred in 1.x. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1487695 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487696 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 01:24:15 +00:00
Vinod Kumar Vavilapalli a2303831b4 MAPREDUCE-5270. Migrated MR app from using BuilderUtil factory methods to individual record factory methods. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1486271 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487158 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-28 22:38:14 +00:00
Suresh Srinivas a1235b5ba9 HADOOP-8562. Merge r1453486 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 20:41:53 +00:00
Vinod Kumar Vavilapalli 44a9273286 MAPREDUCE-5222. Bring back some methods and constants in Jobclient for binary compatibility with mapred in 1.x. Contributed by Karthik Kambatla. 
svn merge --ignore-ancestry -c 1482208 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482209 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 05:52:46 +00:00
Vinod Kumar Vavilapalli 99275f172a MAPREDUCE-4067. Changed MRClientProtocol api to throw IOException only (Xuan Gong via vinodkv) 
svn merge --ignore-ancestry -c 1481695 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481696 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 03:36:15 +00:00
Vinod Kumar Vavilapalli 486391f766 YARN-629. Make YarnRemoteException not be rooted at IOException. Contributed by Xuan Gong. 
MAPREDUCE-5204. Handling YarnRemoteException separately from IOException in MR app after YARN-629. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1479680 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479684 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-06 19:20:02 +00:00
Vinod Kumar Vavilapalli 0b64df0630 YARN-625. Move the utility method unwrapAndThrowException from YarnRemoteExceptionPBImpl to RPCUtil. Contributed by Siddharth Seth. 
svn merge --ignore-ancestry -c 1478594 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478595 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 22:45:30 +00:00
Arun Murthy c281269d0e Merge -c 1471796 from trunk to branch-2 to fix MAPREDUCE-5166. Fix ConcurrentModificationException due to insufficient synchronization on updates to task Counters. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471797 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 00:55:00 +00:00
Bikas Saha 2108a35d28 Merge -c r1469060 from trunk to branch-2 for MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469064 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 20:32:15 +00:00
Siddharth Seth 422133edf7 merge MAPREDUCE-5079 from trunk. Changes job recovery to restore state directly from job history, instaed of simulating state machine events. Contributed by Jason Lowe and Robert Parker. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466770 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 05:02:45 +00:00
Arun Murthy 91a676fc41 Setting version in branch-2 to be 2.0.5-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-10 03:16:30 +00:00
Vinod Kumar Vavilapalli 76d72db5eb YARN-112. Fixed a race condition during localization that fails containers. Contributed by Omkar Vinit Joshi. 
MAPREDUCE-5138. Fix LocalDistributedCacheManager after YARN-112. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1466196 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466197 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 19:57:10 +00:00
Vinod Kumar Vavilapalli 523e98d914 MAPREDUCE-5117. Changed MRClientProtocolPBClientImpl to be closeable and thus fix failures in renewal of HistoryServer's delegations tokens. Contributed by Siddharth Seth. 
svn merge --ignore-ancestry -c 1463828 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463829 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-03 05:40:21 +00:00
Thomas White b1c781b2be MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461537 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 11:42:32 +00:00
Alejandro Abdelnur 7f9b4c4e8b MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446043 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-14 04:22:41 +00:00
Alejandro Abdelnur 1709c222d9 HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446021 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-14 01:36:47 +00:00
Alejandro Abdelnur a6925b3fdd MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445331 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-12 20:16:43 +00:00
Arun Murthy 196341fc09 Setting version to 2.0.4-SNAPSHOT in branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442956 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 13:23:45 +00:00
Siddharth Seth 6f146b15d3 merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439715 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-29 00:23:27 +00:00
Siddharth Seth 44b3be14bc merge YARN-135 from trunk. Client tokens should be per app-attempt, and should be unregistered on App-finish. Contributed by Vinod Kumar Vavilapalli 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433571 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 18:35:10 +00:00
Suresh Srinivas 1b410df23f MAPREDUCE-4938. Merging change 1433227 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433230 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 00:13:43 +00:00
Thomas Graves fdc4c61101 MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432940 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 15:01:35 +00:00
Thomas White 98cb5344eb Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430936 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-09 16:22:55 +00:00
Thomas White 75878f6c7b Merge -r 1430362:1430363 from trunk to branch-2. Fixes: MAPREDUCE-4278. Cannot run two local jobs in parallel from the same gateway. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430369 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-08 16:31:58 +00:00
Vinod Kumar Vavilapalli 9a87b2f7fe MAPREDUCE-4920. Use security token protobuf definition from hadoop common. Contributed by Suresh Srinivas. 
svn merge --ignore-ancestry -c 1429751 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429752 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-07 11:15:10 +00:00
Robert Joseph Evans 199df2b770 svn merge -c 1429114 FIXES: MAPREDUCE-4819. AM can rerun job after reporting final job status to the client (bobby and Bikas Saha via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429115 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 20:38:36 +00:00
Thomas Graves 2cb090a075 MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth Seth via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429105 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 20:31:22 +00:00
Robert Joseph Evans 6862511182 svn merge -c 1428482 FIXES: MAPREDUCE-4279. getClusterStatus() fails with null pointer exception when running jobs in local mode (Devaraj K via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428489 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-03 17:21:27 +00:00
Alejandro Abdelnur 1fce56fd24 MAPREDUCE-4549. Distributed cache conflicts breaks backwards compatability. (Robert Evans via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420363 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-11 19:50:32 +00:00
Thomas White db8545d924 Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify classpath construction for mini YARN tests. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411239 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-19 15:16:57 +00:00
Eli Collins 3bc91c97cb MAPREDUCE-4723. Fix warnings found by findbugs 2. Contributed by Sandy Ryza 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409603 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-15 00:17:17 +00:00
Jason Darrell Lowe 43159cc20d svn merge -c 1401054 FIXES: MAPREDUCE-4740. only .jars can be added to the Distributed Cache classpath. Contributed by Robert Joseph Evans 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401058 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-22 19:58:01 +00:00
Vinod Kumar Vavilapalli 5944b1c703 MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth. 
svn merge --ignore-ancestry -c 1399976 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399977 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-19 05:59:25 +00:00
Thomas Graves e5e1887092 merge -r 1390556:1390557 from trunk. FIXES: MAPREDUCE-4647 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390563 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-26 15:25:05 +00:00
Vinod Kumar Vavilapalli a5e50dfae9 MAPREDUCE-4646. Fixed MR framework to send diagnostic information correctly to clients in case of failed jobs also. Contributed by Jason Lowe. 
svn merge --ignore-ancestry -c 1383709 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383710 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-12 00:59:59 +00:00
Arun Murthy f403be7569 Set version in branch-2 to 2.0.3-SNAPSHOT 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-10 12:57:48 +00:00
Robert Joseph Evans ebb1a16f62 svn merge -c 1382088 FIXES: MAPREDUCE-4629. Remove JobHistory.DEBUG_MODE (Karthik Kambatla via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382089 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-07 16:47:04 +00:00
Arun Murthy b9a3f51dcd Merge -c r1381868 from trunk to branch-2 to fix MR AM supplies MapReduce jars in classpath rather than rely on YARN. Contributed by Arun C Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381869 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-07 04:59:20 +00:00
Robert Joseph Evans 2616974383 svn merge -c 1381614 FIXES: MAPREDUCE-4633. history server doesn't set permissions on all subdirs (tgraves via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381618 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-06 14:22:04 +00:00
Siddharth Seth a1c556ca19 merge MAPREDUCE-4580 from trunk. Change MapReduce to use the yarn-client module. (Contributed by Vinod Kumar Vavilapalli) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377924 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-28 00:41:03 +00:00
Alejandro Abdelnur d7a90bc552 MAPREDUCE-4068. Jars in lib subdirectory of the submittable JAR are not added to the classpath (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376255 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-22 21:23:09 +00:00
Arun Murthy 92a99de731 Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370667 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-08 05:33:56 +00:00
Jonathan Turner Eagles 054dd2d39c svn merge -c 1369197 FIXES: MAPREDUCE-4503. Should throw InvalidJobConfException if duplicates found in cacheArchives or cacheFiles (Robert Evans via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369201 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-03 20:42:18 +00:00
Thomas Graves 5a17a40ee6 merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-31 19:21:27 +00:00
Thomas Graves a1a7ee23f7 merge -r 1367580:1367581 from trunk. FIXES: MAPREDUCE-4456 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367585 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-31 14:49:07 +00:00
Alejandro Abdelnur bd359a1a8e Merge -r 1362750:1362751 from trunk to branch. FIXES: MAPREDUCE-4406 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362752 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-18 03:37:38 +00:00
Alejandro Abdelnur c22cddbad1 Merge -r 1362721:1362722 from trunk to branch. FIXES: MAPREDUCE-4422 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362723 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-17 23:34:38 +00:00
Robert Joseph Evans 796272a502 svn merge -c 1362495 FIXES: MAPREDUCE-4449. Incorrect MR_HISTORY_STORAGE property name in JHAdminConfig (Ahmed Radwan via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362496 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-17 13:51:52 +00:00
Arun Murthy 4902c6bdc9 Merge -c 1361813 from trunk to branch-2 to fix MAPREDUCE-4427. Added an 'unmanaged' mode for AMs so as to ease development of new applications. Contributed by Bikas Saha. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361815 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-15 21:47:53 +00:00
Alejandro Abdelnur 0b4c8a5875 Reverting MAPREDUCE-4346 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354658 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-27 18:33:38 +00:00
Alejandro Abdelnur df2f723a75 Merge -r 1353756:1353757 from trunk to branch. FIXES: MAPREDUCE-4355 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353760 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-25 22:01:01 +00:00
Siddharth Seth 09ac40f800 Merge MAPREDUCE-4290 from trunk. Fix Yarn Applicaiton Status to MR JobState conversion. (Contributed by Devaraj K) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353685 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-25 17:56:11 +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
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
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
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
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
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
Siddharth Seth 40497a9d04 merge MAPREDUCE-4040 from trunk. History links should use hostname rather than IP address. (Contributed by Bhallamudi Venkata Siva Kamesh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312077 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-11 02:52:13 +00:00
Thomas Graves ce9bdceac7 merge -r 1311895:1311896 from trunk. FIXES: MAPREDUCE-4059 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311897 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-10 18:13:09 +00:00
Alejandro Abdelnur 4bdf14f6c9 Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309434 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-04 14:57:41 +00:00
Siddharth Seth 55639bea52 Merge MAPREDUCE-3955 from trunk. Change MR to use ProtobufRpcEngine from hadoop-common instead of ProtoOverHadoopRpcEngine. (Contributed by Jitendra Nath Pandey) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306690 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-29 02:04:21 +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
Harsh J 92f06cb446 svn merge -c 1305343. Merge MAPREDUCE-4066 into branch-0.23 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305348 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-26 13:31:08 +00:00
Siddharth Seth 3e3e6770ca merge MAPREDUCE-3896 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296402 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-02 19:29:14 +00:00
Vinod Kumar Vavilapalli 5240af9d20 MAPREDUCE-3901. Modified JobHistory records in YARN to lazily load job and task reports so as to improve UI response times. Contributed by Siddarth Seth. 
svn merge --ignore-ancestry -c 1294417 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294421 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-28 00:35:12 +00:00
Tsz-wo Sze def75f7560 Merge r1293501 through r1293896 from 0.23. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293899 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-26 17:58:14 +00:00
Vinod Kumar Vavilapalli 2b28bb962a MAPREDUCE-2793. Corrected AppIDs, JobIDs, TaskAttemptIDs to be of correct format on the web pages. Contributed by Bikas Saha. 
svn merge --ignore-ancestry -c 1293517 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293519 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-25 02:07:19 +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
Tsz-wo Sze 024c23c95f Merge r1291972 through r1293033 from 0.23. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293035 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-23 23:52:26 +00:00
Alejandro Abdelnur b512e9f282 Merge -r 1292423:1292424 from trunk to branch. FIXES: MAPREDUCE-3884 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1292427 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-22 18:03:27 +00:00
Tsz-wo Sze bd3c2b26ec Merge r1244222 through r1245749 from 0.23. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1245750 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-17 20:43:55 +00:00