Commit Graph

239 Commits

Author SHA1 Message Date
Thomas Graves
6b1f5073a7 MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1524841 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 20:58:18 +00:00
Arun Murthy
60a1a70197 YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contibuted by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523652 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 14:04:04 +00:00
Vinod Kumar Vavilapalli
5adba5597c YARN-1085. Addendum patch to address issues with the earlier patch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1517721 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 22:59:09 +00:00
Chris Nauroth
200220e8f3 MAPREDUCE-5470. LocalJobRunner does not work on Windows. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1516623 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 21:39:30 +00:00
Alejandro Abdelnur
8451ab5c01 HADOOP-9872. Improve protoc version handling and detection. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1514068 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:15:04 +00:00
Alejandro Abdelnur
19b36f0900 HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1513281 13f79535-47bb-0310-9956-ffa450edef68
2013-08-12 22:15:10 +00:00
Sanford Ryza
0cb2fdc3b4 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/trunk@1510866 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 06:36:21 +00:00
Sanford Ryza
6ea797d0d0 MAPREDUCE-5367. Local jobs all use same local working directory (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1510610 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 17:07:58 +00:00
Vinod Kumar Vavilapalli
1d915238a6 MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. Contributed by Omkar Vinit Joshi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1508595 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 20:04:37 +00:00
Jason Darrell Lowe
cc536fe4da 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/trunk@1504645 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 20:41:14 +00:00
Chris Nauroth
06ea8ffcf2 MAPREDUCE-5359. JobHistory should not use File.separator to match timestamp in path. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1499153 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 23:57:30 +00:00
Vinod Kumar Vavilapalli
c0cd68d8fb YARN-773. Moved YarnRuntimeException from package api.yarn to api.yarn.exceptions. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492903 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 23:25:14 +00:00
Vinod Kumar Vavilapalli
66de4ccf60 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489658 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 22:43:19 +00:00
Vinod Kumar Vavilapalli
a83fb61ac0 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/trunk@1489283 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 04:05:50 +00:00
Vinod Kumar Vavilapalli
d33534c4fb 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489257 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 00:34:18 +00:00
Arun Murthy
78331cfeca 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/trunk@1489227 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:42:28 +00:00
Siddharth Seth
a2205a3b72 YARN-720 and MAPREDUCE-5291. 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/trunk@1488829 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 02:35:34 +00:00
Vinod Kumar Vavilapalli
a2c4233004 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488616 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 21:43:17 +00:00
Vinod Kumar Vavilapalli
982753dc8e 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487994 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 20:18:39 +00:00
Vinod Kumar Vavilapalli
a720a524e9 MAPREDUCE-5263. Bring back old methods and fields in filecache.DistributedCache for binary compatibility with mapred in 1.x. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487695 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 01:23:16 +00:00
Vinod Kumar Vavilapalli
643155cbee MAPREDUCE-5270. Migrated MR app from using BuilderUtil factory methods to individual record factory methods. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1486271 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 01:46:14 +00:00
Vinod Kumar Vavilapalli
4d8e350750 MAPREDUCE-5232. Add a configuration to be able to log classpath and other system properties on mapreduce JVMs startup. Contributed by Sangjin Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1482643 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 23:43:53 +00:00
Vinod Kumar Vavilapalli
febf951220 MAPREDUCE-5222. Bring back some methods and constants in Jobclient for binary compatibility with mapred in 1.x. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1482208 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 05:52:11 +00:00
Vinod Kumar Vavilapalli
7359dc32d3 MAPREDUCE-4067. Changed MRClientProtocol api to throw IOException only (Xuan Gong via vinodkv)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481695 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 03:34:25 +00:00
Vinod Kumar Vavilapalli
92b7165a71 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1479680 13f79535-47bb-0310-9956-ffa450edef68
2013-05-06 19:04:31 +00:00
Vinod Kumar Vavilapalli
fc275fed66 YARN-625. Move the utility method unwrapAndThrowException from YarnRemoteExceptionPBImpl to RPCUtil. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1478594 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 22:44:12 +00:00
Arun Murthy
daaa73b657 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/trunk@1471796 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 00:54:04 +00:00
Bikas Saha
9e650d36b7 MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469060 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 20:25:21 +00:00
Siddharth Seth
6a1c41111e MAPREDUCE-5079. 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/trunk@1466767 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 04:52:38 +00:00
Vinod Kumar Vavilapalli
3a54a5653b 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466196 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 19:56:10 +00:00
Vinod Kumar Vavilapalli
38678cc3d9 MAPREDUCE-5117. Changed MRClientProtocolPBClientImpl to be closeable and thus fix failures in renewal of HistoryServer's delegations tokens. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463828 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 05:37:10 +00:00
Thomas White
375584ae0f 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/trunk@1461541 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 11:47:06 +00:00
Suresh Srinivas
638801cce1 HADOOP-8952. Enhancements to support Hadoop on Windows Server and Windows Azure environments. Contributed by Ivan Mitic, Chuan Liu, Ramya Sunil, Bikas Saha, Kanna Karanam, John Gordon, Brandon Li, Chris Nauroth, David Lao, Sumadhur Reddy Bolli, Arpit Agarwal, Ahmed El Baz, Mike Liddell, Jing Zhao, Thejas Nair, Steve Maine, Ganeshan Iyer, Raja Aluri, Giridharan Kesavan, Ramya Bharathi Nimmagadda.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453486 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 19:15:18 +00:00
Alejandro Abdelnur
ab330b33bb MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446042 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 04:22:04 +00:00
Alejandro Abdelnur
6bcbf492a2 HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 22:13:44 +00:00
Alejandro Abdelnur
7e615c7f75 MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445330 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 20:16:08 +00:00
Siddharth Seth
c163dc2fce MAPREDUCE-4838. 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/trunk@1439714 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 00:21:58 +00:00
Siddharth Seth
6a2f2551fd YARN-135. 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/trunk@1433570 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 18:33:38 +00:00
Suresh Srinivas
86825d8390 MAPREDUCE-4938. Use token request messages defined in hadoop common. Contributed by Suresh Srinvias.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433227 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 00:11:16 +00:00
Thomas Graves
e7aeb9d129 MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1432932 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 14:35:45 +00:00
Thomas White
0ba7078ef4 MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1430929 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 16:12:58 +00:00
Thomas White
0f1f5491bc 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/trunk@1430363 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 16:26:33 +00:00
Vinod Kumar Vavilapalli
b8a7a17191 MAPREDUCE-4920. Use security token protobuf definition from hadoop common. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1429751 13f79535-47bb-0310-9956-ffa450edef68
2013-01-07 11:13:26 +00:00
Robert Joseph Evans
64e4fb983e 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/trunk@1429114 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:35:56 +00:00
Thomas Graves
e17cecf550 MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth Seth via tgraves
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1429086 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:15:43 +00:00
Robert Joseph Evans
e229e25cc3 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/trunk@1428482 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 17:09:18 +00:00
Thomas White
e464607b7d YARN-129. Simplify classpath construction for mini YARN tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1411235 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 15:12:22 +00:00
Eli Collins
905b17876c MAPREDUCE-4723. Fix warnings found by findbugs 2. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1409601 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 00:16:35 +00:00
Jason Darrell Lowe
49beea562a 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/trunk@1401054 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 19:50:23 +00:00
Vinod Kumar Vavilapalli
022f7b4a25 MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1399976 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 05:57:57 +00:00
Thomas Graves
050fd3a117 MAPREDUCE-4647. We should only unjar jobjar if there is a lib directory in it. (Robert Evans via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1390557 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 15:22:21 +00:00
Vinod Kumar Vavilapalli
229a79bbc3 MAPREDUCE-4646. Fixed MR framework to send diagnostic information correctly to clients in case of failed jobs also. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1383709 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 00:59:15 +00:00
Robert Joseph Evans
77805c7ae4 MAPREDUCE-4629. Remove JobHistory.DEBUG_MODE (Karthik Kambatla via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1382088 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 16:45:03 +00:00
Arun Murthy
0056914773 MAPREDUCE-4638. 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/trunk@1381868 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 04:56:32 +00:00
Robert Joseph Evans
5dcb594cb8 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/trunk@1381614 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 14:20:43 +00:00
Siddharth Seth
24e47ebc18 MAPREDUCE-4580. Change MapReduce to use the yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377922 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 00:40:02 +00:00
Alejandro Abdelnur
dc33a0765c 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/trunk@1376253 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 21:18:34 +00:00
Arun Murthy
e1fdf62123 YARN-1. Promote YARN to be a sub-project of Apache Hadoop.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370666 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 05:22:27 +00:00
Jonathan Turner Eagles
72789336b2 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/trunk@1369197 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 20:29:29 +00:00
Thomas Graves
735b50e8bd MAPREDUCE-4493. Distibuted Cache Compatability Issues (Robert Evans via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367713 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:20:03 +00:00
Thomas Graves
e9bf6c56c5 MAPREDUCE-4456. LocalDistributedCacheManager can get an ArrayIndexOutOfBounds when creating symlinks (Robert Evans via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367581 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 14:46:57 +00:00
Alejandro Abdelnur
c700642308 MAPREDUCE-4406. Users should be able to specify the MiniCluster ResourceManager and JobHistoryServer ports. (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362751 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 03:36:46 +00:00
Alejandro Abdelnur
2e00d28f14 MAPREDUCE-4422. YARN_APPLICATION_CLASSPATH needs a documented default value in YarnConfiguration. (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362722 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 23:31:16 +00:00
Robert Joseph Evans
177f6feaa1 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/trunk@1362495 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 13:50:35 +00:00
Arun Murthy
ae6cc14611 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/trunk@1361813 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 21:46:07 +00:00
Alejandro Abdelnur
1b21c9836e Reverting MAPREDUCE-4346 r1353757
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1354656 13f79535-47bb-0310-9956-ffa450edef68
2012-06-27 18:29:42 +00:00
Alejandro Abdelnur
d9bbd5997d MAPREDUCE-4355. Add JobStatus getJobStatus(JobID) to JobClient. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1353757 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 21:55:44 +00:00
Siddharth Seth
75269b5488 MAPREDUCE-4290. Fix Yarn Applicaiton Status to MR JobState conversion. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1353684 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 17:54:48 +00:00
Thomas White
13ad756796 MAPREDUCE-3871. Allow symlinking in LocalJobRunner DistributedCache.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1348997 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 20:37:03 +00:00
Harsh J
1fab229f30 HADOOP-8268. A few pom.xml across Hadoop project may fail XML validation. Contributed by Radim Kolar. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1343272 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:51:05 +00:00
Thomas White
aea890f7d2 MAPREDUCE-4148. MapReduce should not have a compile-time dependency on HDFS.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1337199 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 15:00:48 +00:00
Robert Joseph Evans
aa60da6c2e MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1335567 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:07:40 +00:00
Robert Joseph Evans
512fd2756a MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1332716 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 15:59:36 +00:00
Thomas Graves
2755a2e283 MAPREDUCE-4212. TestJobClientGetJob sometimes fails (Daryn Sharp via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1332665 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 14:10:45 +00:00
Siddharth Seth
13bfe4794b MAPREDUCE-4040. 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/trunk@1312076 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 02:50:02 +00:00
Thomas Graves
cbb5f61090 MAPREDUCE-4059. The history server should have a separate pluggable storage/query interface. (Robert Evans via tgraves).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1311896 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:11:26 +00:00
Alejandro Abdelnur
da1b01c9e3 MAPREDUCE-4098. TestMRApps testSetClasspath fails (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309432 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:56:13 +00:00
Siddharth Seth
db3e592df0 REDUCE-3955. 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/trunk@1306689 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 02:02:17 +00:00
Arun Murthy
67a74198b1 Changed version in trunk to 3.0.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306200 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:37:06 +00:00
Harsh J
d5836856a2 MAPREDUCE-4066. Use default value when fetching MR_AM_STAGING_DIR. Contributed by xieguiming.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1305343 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 13:21:36 +00:00
Siddharth Seth
99bf2902b2 MAPREDUCE-3896. Add user information to the delegation token issued by the history server. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1296401 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 19:28:04 +00:00
Vinod Kumar Vavilapalli
7475e836dc 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.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1294417 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 00:32:19 +00:00
Vinod Kumar Vavilapalli
7a082ec2bd MAPREDUCE-2793. Corrected AppIDs, JobIDs, TaskAttemptIDs to be of correct format on the web pages. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293517 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 02:03:59 +00:00
Alejandro Abdelnur
267bebeab0 MAPREDUCE-3884. PWD should be first in the classpath of MR tasks (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1292424 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 17:57:32 +00:00
Alejandro Abdelnur
89bd2210a7 MAPREDUCE-3736. Variable substitution depth too large for fs.default.name causes jobs to fail (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244264 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 23:09:05 +00:00
Vinod Kumar Vavilapalli
0515b3322f MAPREDUCE-3846. Addressed MR AM hanging issues during AM restart and then the recovery. (vinodkv)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243752 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 00:06:37 +00:00
Siddharth Seth
fb498926be MAPREDUCE-3436. JobHistory webapp address should use the host configured in the jobhistory address. (Contributed by Ahmed Radwan)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241620 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 20:55:10 +00:00
Mahadev Konar
947ede4c4e MAPREDUCE-3696. MR job via oozie does not work on hadoop 23. (John George via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239310 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 20:43:10 +00:00
Alejandro Abdelnur
f73daf6af1 MAPREDUCE-3505. yarn APPLICATION_CLASSPATH needs to be overridable. (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235391 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 18:21:27 +00:00
Mahadev Konar
c6923061d0 MAPREDUCE-3698. Client cannot talk to the history server in secure mode. (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234120 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 20:44:17 +00:00
Thomas White
8b2f6909ec MAPREDUCE-3684. LocalDistributedCacheManager does not shut down its thread pool.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1232981 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 18:20:13 +00:00
Arun Murthy
d737c323a6 MAPREDUCE-3669. Allow clients to talk to MR HistoryServer using both delegation tokens and kerberos. Contributed by Mahadev Konar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1232580 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:25:08 +00:00
Mahadev Konar
bc4b1f48d3 MAPREDUCE-3380. Token infrastructure for running clients which are not kerberos authenticated. (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229855 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 01:50:10 +00:00
Siddharth Seth
239a5549ea MAPREDUCE-3616. Thread pool for launching containers in MR AM not expanding as expected. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229394 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 22:20:23 +00:00
Vinod Kumar Vavilapalli
e8645636ce MAPREDUCE-3511. Removed a multitude of cloned/duplicate counters in the AM thereby reducing the AM heap size and preventing full GCs. (vinodkv)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229347 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 21:04:58 +00:00
Arun Murthy
a61a18cc09 MAPREDUCE-3563. Fixed LocalJobRunner to work correctly with new mapreduce apis.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220996 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 23:07:17 +00:00
Suresh Srinivas
f7f5e51431 Missed deleting the files in r1214066
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214106 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:30:37 +00:00
Suresh Srinivas
ec4971a280 MAPREDUCE-3545. Remove Avro RPC. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214066 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 06:57:00 +00:00
Vinod Kumar Vavilapalli
b7ae5a6cb7 MAPREDUCE-3426. Fixed MR AM in uber mode to write map intermediate outputs in the correct directory to work properly in secure mode. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213987 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:35:11 +00:00
Mahadev Konar
9b75b05163 MAPREDUCE-3328. mapred queue -list output inconsistent and missing child queues. (Ravi Prakash via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213504 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 23:56:26 +00:00
Alejandro Abdelnur
6a358ee140 MAPREDUCE-3389. MRApps loads the 'mrapp-generated-classpath' file with classpath from the build machine. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210548 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 18:02:47 +00:00
Thomas White
72e9ec7a45 MAPREDUCE-3479. JobClient#getJob cannot find local jobs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1209791 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 00:16:30 +00:00
Mahadev Konar
ea17da82f7 MAPREDUCE-3121. NodeManager should handle disk-failures (Ravi Gummadi via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208131 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 23:17:54 +00:00
Vinod Kumar Vavilapalli
9fe9f42c8f MAPREDUCE-3342. Fixed JobHistoryServer to also show the job's queue name. Contributed by Jonathan Eagles.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1199133 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 07:28:56 +00:00
Thomas White
8e04fa8b84 HADOOP-7782. Aggregate project javadocs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1195817 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 04:47:10 +00:00
Arun Murthy
cfb6a9883d MAPREDUCE-3237. Move LocalJobRunner to hadoop-mapreduce-client-core. Contributed by Tom White.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1195792 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 03:16:44 +00:00
Vinod Kumar Vavilapalli
47a381e306 MAPREDUCE-3146. Added a MR specific command line to dump logs for a given TaskAttemptID. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1195349 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 06:42:06 +00:00
Mahadev Konar
35b62e6e72 MAPREDUCE-3282. bin/mapred job -list throws exception. (acmurthy via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1190110 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 01:16:29 +00:00
Arun Murthy
c70ee2488c MAPREDUCE-3248. Fixed log4j properties. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1188476 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 01:03:08 +00:00
Vinod Kumar Vavilapalli
665a90cbf3 MAPREDUCE-3087. Fixed the mapreduce classpath to correctly include the generated-classpath file needed for tests. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1187658 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 06:46:12 +00:00
Mahadev Konar
4186121c08 MAPREDUCE-3239. Use new createSocketAddr API in MRv2 to give better error messages on misconfig (Todd Lipcon via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1187556 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 21:36:58 +00:00
Vinod Kumar Vavilapalli
3e3abcb769 MAPREDUCE-3199. Fixed pom files to include correct log4j configuration for tests. (vinodkv)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1185967 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 04:30:27 +00:00
Arun Murthy
ab787f44aa MAPREDUCE-3165. Ensure logging options are set correctly for MR AM and tasks. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1185887 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:45:38 +00:00
Arun Murthy
c1d90772b6 MAPREDUCE-3068. Added a whitelist of environment variables for containers from the NodeManager and set MALLOC_ARENA_MAX for all daemons and containers. Contributed by Chris Riccomini.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1185447 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 01:22:14 +00:00
Alejandro Abdelnur
15a1d9af19 MAPREDUCE-3003. Publish MR JARs to Maven snapshot repository. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1185286 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 17:06:42 +00:00
Arun Murthy
26d63ecdae MAPREDUCE-2789. Complete schedulingInfo on CLI. Contributed by Eric Payne.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1182616 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 23:29:01 +00:00
Alejandro Abdelnur
4972959173 Reverted MAPREDUCE-3003
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1180283 13f79535-47bb-0310-9956-ffa450edef68
2011-10-08 00:38:41 +00:00
Arun Murthy
047b175aac MAPREDUCE-2802. Ensure JobHistory filenames have jobId. Contributed by Jonathan Eagles.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1180220 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 20:44:37 +00:00
Alejandro Abdelnur
68d1162f7a MAPREDUCE-3003. Publish Yarn and MapReduce artifacts to Maven snapshot repository. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1180155 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 19:01:01 +00:00
Vinod Kumar Vavilapalli
063e33a862 MAPREDUCE-3098. Fixed RM and MR AM to report YarnApplicationState and application's FinalStatus separately. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1177633 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 12:46:32 +00:00
Arun Murthy
0b3c654d83 MAPREDUCE-2791. Added missing info on 'job -status' output. Contributed by Devaraj K.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1177487 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 03:08:35 +00:00
Arun Murthy
312a7e7100 MAPREDUCE-3078. Ensure MapReduce AM reports progress correctly for displaying on the RM Web-UI. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1176762 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 07:31:03 +00:00
Arun Murthy
5f6adcf396 MAPREDUCE-3021. Change base urls for RM web-ui. Contributed by Thomas Graves.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1176681 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 01:23:04 +00:00
Vinod Kumar Vavilapalli
a5c9ede143 MAPREDUCE-2952. Fixed ResourceManager/MR-client to consume diagnostics for AM failures in a couple of corner cases. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1175403 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 14:46:59 +00:00
Vinod Kumar Vavilapalli
d00b3c49f6 MAPREDUCE-2880. Improved classpath-construction for mapreduce AM and containers. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1173783 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 18:28:23 +00:00
Arun Murthy
0e870d7d18 MAPREDUCE-3023. Fixed clients to display queue state correctly. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1173458 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 01:32:14 +00:00
Vinod Kumar Vavilapalli
34d3936bcd MAPREDUCE-2965. Streamlined the methods hashCode(), equals(), compareTo() and toString() for all IDs. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1172212 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 07:51:11 +00:00
Mahadev Konar
d9ba4670ed MAPREDUCE-2672. MR-279: JobHistory Server needs Analysis this job. (Robert Evans via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1171297 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 22:21:00 +00:00
Mahadev Konar
88b82a0f66 MAPREDUCE-2899. Replace major parts of ApplicationSubmissionContext with a ContainerLaunchContext (Arun Murthy via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1170459 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 07:26:37 +00:00
Arun Murthy
fafe8cd28e MAPREDUCE-2864. Normalize configuration variable names for YARN. Contributed by Robert Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1166955 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 01:44:58 +00:00
Arun Murthy
1f46b991da MAPREDUCE-2908. Fix all findbugs warnings. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1166838 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:26:20 +00:00
Vinod Kumar Vavilapalli
6bdf5746d5 MAPREDUCE-2716. MRReliabilityTest job fails because of missing job-file. Contributed by Jeffrey Naisbitt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1164805 13f79535-47bb-0310-9956-ffa450edef68
2011-09-03 06:22:03 +00:00
Mahadev Konar
fb6ecb9b27 MAPREDUCE-2886. Fix Javadoc warnings in MapReduce. (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1163050 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 23:27:47 +00:00
Arun Murthy
a44ffcc0be Preparing for hadoop-0.24.0 development.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161736 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 20:32:04 +00:00
Arun Murthy
58676edf98 MAPREDUCE-2879. Fix version for MR-279 to 0.23.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161705 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 19:13:50 +00:00
Arun Murthy
1dd113b24a MAPREDUCE-2796. Set start times for MR applications for clients to see. Contributed by Devaraj K.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161704 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 19:12:35 +00:00
Mahadev Konar
7c85f33ce1 MAPREDUCE-2877. Add missing Apache license header in some files in MR and also add the rat plugin to the poms. (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161650 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 17:16:36 +00:00
Sharad Agarwal
f2b91a8367 MAPREDUCE-2807. Fix AM restart and client redirection. Contributed by Sharad Agarwal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161408 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 06:35:58 +00:00
Arun Murthy
cd7157784e HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161332 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 00:14:24 +00:00