Commit Graph

1265 Commits

Author SHA1 Message Date
Alejandro Abdelnur cc2c01fc94 YARN-272. Fair scheduler log messages try to print objects without overridden toString methods. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424988 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 16:03:50 +00:00
Thomas White 0e9379a9f1 Merge -r 1424944:1424945 from trunk to branch-2. Fixes: YARN-271. Fair scheduler hits IllegalStateException trying to reserve different apps on same node. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424946 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 15:11:43 +00:00
Arun Murthy 50a515b45b Merge -c 1423758 from trunk to branch-2 to fix YARN-230. RM Restart phase 1 - includes support for saving/restarting all applications on an RM bounce. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423759 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 04:34:54 +00:00
Alejandro Abdelnur 7b7fc7b788 YARN-254. Update fair scheduler web UI for hierarchical queues. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423743 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 03:06:49 +00:00
Alejandro Abdelnur 6a29bf5703 YARN-264. y.s.rm.DelegationTokenRenewer attempts to renew token even after removing an app. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1421578 13f79535-47bb-0310-9956-ffa450edef68
2012-12-13 22:21:16 +00:00
Thomas White 30eaf879e3 Merge -r 1420703:1420704 from trunk to branch-2. Fixes: YARN-267. Fix fair scheduler web UI. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420706 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 14:36:07 +00:00
Jason Darrell Lowe e2c0cf69ca svn merge -c 1420232 FIXES: YARN-266. RM and JHS Web UIs are blank because AppsBlock is not escaping string properly. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420233 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 15:51:12 +00:00
Jason Darrell Lowe 1e5a61e3e8 svn merge -c 1417948 FIXES: YARN-258. RM web page UI shows Invalid Date for start and finish times. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1417950 13f79535-47bb-0310-9956-ffa450edef68
2012-12-06 15:41:20 +00:00
Jason Darrell Lowe 74122abb1f svn merge -c 1415742 FIXES: YARN-251. Proxy URI generation fails for blank tracking URIs. Contributed by Tom White
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415745 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 17:10:39 +00:00
Thomas White 232cc5d59c Merge -r 1415591:1415592 from trunk to branch-2. Fixes: YARN-187. Add hierarchical queues to the fair scheduler. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415593 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 12:05:13 +00:00
Arun Murthy 7b092edd2f Merge -c 1415029 from trunk to branch-2 to fix YARN-229. Remove old unused RM recovery code. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415030 13f79535-47bb-0310-9956-ffa450edef68
2012-11-29 01:59:49 +00:00
Thomas White 3eedaed911 Merge -r 1414728:1414729 from trunk to branch-2. Fixes: MAPREDUCE-4778. Fair scheduler event log is only written if directory exists on HDFS. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414730 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 14:42:22 +00:00
Thomas White c3448fe289 Merge -r 1414654:1414655 from trunk to branch-2. Fixes: YARN-222. Fair scheduler should create queue for each user by default. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414723 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 14:23:32 +00:00
Thomas White 0e1b19a111 Merge -r 1414646:1414647 from trunk to branch-2. Fixes: YARN-224. Fair scheduler logs too many nodeUpdate INFO messages. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414648 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 12:28:35 +00:00
Alejandro Abdelnur 94c43d250e YARN-184. Remove unnecessary locking in fair scheduler, and address findbugs excludes. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410830 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 05:46:29 +00:00
Robert Joseph Evans 0685e9eb75 svn merge -c 1410564 FIXES: YARN-151. Browser thinks RM main page JS is taking too long (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410565 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 21:03:41 +00:00
Robert Joseph Evans af25e22798 svn merge -c 1410522 FIXES: YARN-214. RMContainerImpl does not handle event EXPIRE at state RUNNING (jeagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410524 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 18:29:21 +00:00
Robert Joseph Evans fcc84bcf2a svn merge -c 1409827 FIXES: YARN-188. Coverage fixing for CapacityScheduler (Aleksey Gorshkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409829 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 15:19:30 +00:00
Jason Darrell Lowe 8ca6059743 svn merge -c 1409313 FIXES: YARN-216. Remove jquery theming support. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409314 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 19:26:54 +00:00
Jonathan Turner Eagles f7f9924ef8 YARN-206. TestApplicationCleanup.testContainerCleanup occasionally fails. (jlowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407607 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 19:55:37 +00:00
Thomas White c6dd3c0263 Merge -r 1407432:1407433 from trunk to branch. Fixes: YARN-183. Clean up fair scheduler code. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407434 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 12:39:26 +00:00
Arun Murthy b71f09c5f4 Merge -c 1406834 from trunk to branch-2 to fix YARN-201. Fix CapacityScheduler to be less conservative for starved off-switch requests. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1406835 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 21:57:01 +00:00
Vinod Kumar Vavilapalli 4722d76b4c YARN-189. Fixed a deadlock between RM's ApplicationMasterService and the dispatcher. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1404431 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404432 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 00:33:32 +00:00
Robert Joseph Evans aaa448f9dd svn merge -c 1404247 FIXES: YARN-166. capacity scheduler doesn't allow capacity < 1.0 (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404249 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 17:00:01 +00:00
Robert Joseph Evans 08bae96f5c svn merge -c 1404228 FIXES: YARN-159. RM web ui applications page should be sorted to display last app first (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404230 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 16:24:25 +00:00
Robert Joseph Evans 763c672ba2 svn merge -c 1404211 FIXES: YARN-165. RM should point tracking URL to RM web page for app when AM fails (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404213 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 15:50:53 +00:00
Thomas White 348faf8f36 Merge -r 1402656:1402657 from trunk to branch-2. Fixes: YARN-145. Add a Web UI to the fair share scheduler. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402659 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 21:03:20 +00:00
Robert Joseph Evans c4defd0cff svn merge -c 1401703 FIXES: YARN-180. Capacity scheduler - containers that get reserved create container token to early (acmurthy and bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401705 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 14:20:09 +00:00
Thomas Graves 1ef0ff3af5 merge -r 1401667:1401668 from trunk. FIXES: YARN-177
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401669 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 13:25:19 +00:00
Vinod Kumar Vavilapalli e49fb14997 YARN-181. Fixed eclipse settings broken by capacity-scheduler.xml move via YARN-140. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1401504 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401508 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 22:49:37 +00:00
Siddharth Seth 243966374b merge YARN-179 from trunk. Fix some unit test failures. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401482 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:07:42 +00:00
Alejandro Abdelnur e0ced0a835 YARN-140. Add capacity-scheduler-default.xml to provide a default set of configurations for the capacity scheduler. (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400337 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 23:18:00 +00:00
Siddharth Seth aafad662be merge YARN-136 from trunk. Make ClientToAMTokenSecretManager part of RMContext (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400279 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 20:39:41 +00:00
Vinod Kumar Vavilapalli 9b7e8c4274 YARN-32. Fix TestApplicationTokens to not depend on test order and thus pass on JDK7. Contributed by Vinod Kumar Vavilapali.
svn merge --ignore-ancestry -c 1399795 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399796 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 19:12:53 +00:00
Vinod Kumar Vavilapalli 32d3e4e9f5 YARN-43. Fix TestResourceTrackerService to not depend on test order and thus pass on JDK7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1399066 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399067 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 01:29:12 +00:00
Thomas White 0aad6f2dac Merge -r 1396971:1396972 from trunk to branch-2. Fixes: YARN-146. Add unit tests for computing fair share in the fair scheduler. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 10:30:53 +00:00
Siddharth Seth 13fe2bd483 merge YARN-150 from trunk. Fixes AppRejectedTransition does not unregister a rejected app-attempt from the ApplicationMasterService (Contributed by Bikas Saha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396430 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 00:09:29 +00:00
Vinod Kumar Vavilapalli 9d7c8f5d89 YARN-30. Fixed tests verifying web-services to work on JDK7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1396391 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396392 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 22:55:11 +00:00
Siddharth Seth b98a3a3787 merge YARN-134 from trunk. Fixes ClientToAMSecretManager creates keys without checking for validity of the appID. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395843 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 01:58:07 +00:00
Vinod Kumar Vavilapalli 59da1ac1fc YARN-127. Move RMAdmin tool to its correct location - the client module. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1395781 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395782 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 21:24:37 +00:00
Alejandro Abdelnur ae68ae6919 YARN-23. FairScheduler: FSQueueSchedulable#updateDemand() - potential redundant aggregation. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394322 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 23:02:28 +00:00
Siddharth Seth 60a5f6b520 merge YARN-102 from trunk. Move the apache header to the top of the file in MemStore.java. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393771 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 21:20:10 +00:00
Siddharth Seth 9f3f66375e merge YARN-131 from trunk. Fix incorrect ACL properties in capacity scheduler documentation. (Contributed by Ahmed Radwan)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393263 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 02:57:25 +00:00
Arun Murthy 41aa8aeb07 Merge -c 1391944 from trunk to branch-2 to fix YARN-138. Ensure default values for minimum/maximum container sizes is sane. Contributed by Harsh J and Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391945 13f79535-47bb-0310-9956-ffa450edef68
2012-09-30 03:46:51 +00:00
Arun Murthy 7418b5f357 Merge -c 1391929 from trunk to branch-2 to fix YARN-137. Change the default YARN scheduler to be the CapacityScheduler. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391930 13f79535-47bb-0310-9956-ffa450edef68
2012-09-30 00:44:15 +00:00
Siddharth Seth 060e4f256d merge YARN-116 from trunk. Add the ability to change the RM include/exclude file without a restart. (Contributed by xieguiming and Harsh J)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391913 13f79535-47bb-0310-9956-ffa450edef68
2012-09-29 22:40:58 +00:00
Vinod Kumar Vavilapalli f1749af465 Fix NodeManager to verify the application's user-name
svn merge --ignore-ancestry -c 1390825 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390826 13f79535-47bb-0310-9956-ffa450edef68
2012-09-27 03:45:05 +00:00
Vinod Kumar Vavilapalli e7b414289c YARN-53. Added the missing getGroups API to ResourceManager. Contributed by Bo Wang.
svn merge --ignore-ancestry -c 1389176 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1389177 13f79535-47bb-0310-9956-ffa450edef68
2012-09-24 00:52:55 +00:00
Vinod Kumar Vavilapalli 1415f8490d YARN-93. Fixed RM to propagate diagnostics from applications that have finished but failed Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1384169 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384170 13f79535-47bb-0310-9956-ffa450edef68
2012-09-13 00:47:54 +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
Arun Murthy 69d9fa75bc Merge -c r1381868 from trunk to branch-2 to fix YARN-80. Add support for delaying rack-local containers in CapacityScheduler. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381873 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 05:11:46 +00:00
Vinod Kumar Vavilapalli 3f22ec2960 YARN-75. Fixing spurious patch apply.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381822 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 00:29:26 +00:00
Vinod Kumar Vavilapalli 445a340593 YARN-75. Modified ResourceManager's RMContainer to handle a valid RELEASE event at RUNNING state. Contributed by Siddharth Seth.
svn merge -r 1381806:1381809 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381816 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 00:21:36 +00:00
Robert Joseph Evans cde65024a2 YARN-60: Fix minor merge conflict (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379558 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 19:28:21 +00:00
Vinod Kumar Vavilapalli bbfbbf31c8 YARN-60. Fixed a bug in ResourceManager which causes all NMs to get NPEs and thus causes all containers to be rejected. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1379550 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379551 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 19:12:57 +00:00
Robert Joseph Evans 7287665955 svn merge -c 1379498. FIXES: YARN-63. RMNodeImpl is missing valid transitions from the UNHEALTHY state (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379500 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 16:34:33 +00:00
Vinod Kumar Vavilapalli 57c4f237e2 YARN-31. Fix TestDelegationTokenRenewer to not depend on test order so as to pass tests on jdk7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1377961 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377963 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 03:33:20 +00:00
Siddharth Seth d2b4457eaf merge YARN-37 from trunk. Change TestRMAppTransitions to use the DrainDispatcher. (Contributed by Mayank Bansal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377805 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 19:38:24 +00:00
Siddharth Seth bf08346d3c merge YARN-39 from trunk. RM-NM secret-keys should be randomly generated and rolled every so often. (Contributed by Vinod Kumar Vavilapalli and Siddharth Seth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377181 13f79535-47bb-0310-9956-ffa450edef68
2012-08-25 02:25:12 +00:00
Thomas Graves d6c75fbbb1 merge -r 1375082:1375083 from trunk. FIXES: YARN-27
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375084 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 16:06:25 +00:00
Thomas Graves 8a5ab9229d merge -r 1375065:1375066 from trunk. FIXES: YARN-27
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375067 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 15:37:43 +00:00
Alejandro Abdelnur b344870bdd HADOOP-8681. add support for HTTPS to the web UIs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372642 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:56:31 +00:00
Todd Lipcon 3960c66081 YARN-13. Fix pom versions for YARN in branch-2. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370933 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 20:12:38 +00:00
Arun Murthy 9337abd0b0 Merge -c 1370889 from trunk to branch-2 to fix YARN-12. Fix findbugs warnings in FairScheduler. Contributed by Junping Du.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370890 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 18:54:26 +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