Commit Graph

359 Commits

Author SHA1 Message Date
Siddharth Seth e4f63a94b0 merge MAPREDUCE-3531 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214595 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 02:11:19 +00:00
Vinod Kumar Vavilapalli 5aa03f2ef5 MAPREDUCE-3530. Fixed an NPE occuring during scheduling in the ResourceManager. Contributed by Arun C Murthy.
svn merge -c 1214476 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214478 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 21:23:41 +00:00
Vinod Kumar Vavilapalli 4ba1442b67 MAPREDUCE-3398. Fixed log aggregation to work correctly in secure mode. Contributed by Siddharth Seth.
svn merge -c 1214429 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214432 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 19:58:00 +00:00
Vinod Kumar Vavilapalli affa6d2ee1 MAPREDUCE-2863. Support web services for YARN and MR components. Contributed by Thomas Graves.
svn merge -c 1213975 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213978 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:12:33 +00:00
Arun Murthy 88f815fc54 Merge -c 1213575 from trunk to branch-0.23 to fix MAPREDUCE-3537.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213576 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 06:35:10 +00:00
Mahadev Konar f340be0927 MAPREDUCE-3510. Capacity Scheduler inherited ACLs not displayed by mapred queue -showacls (Jonathan Eagles via mahadev) - Merging r1213511 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213516 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 00:24:48 +00:00
Vinod Kumar Vavilapalli f005c3223c MAPREDUCE-3519. Fixed a deadlock in NodeManager LocalDirectories's handling service. Contributed by Ravi Gummadi.
svn merge -c 1212680 --ignore-ancestry ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212681 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 23:19:59 +00:00
Tsz-wo Sze 518998937b svn merge -c 1212299 from trunk for HDFS-2594.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212301 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 09:34:32 +00:00
Mahadev Konar 24dcbbc524 MAPREDUCE-3513. Capacity Scheduler web UI has a spelling mistake for Memory. (chackaravarthy via mahadev) - Merging r1212215 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212216 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 02:01:22 +00:00
Mahadev Konar a1938ca733 MAPREDUCE-3327. RM web ui scheduler link doesn't show correct max value for queues (Anupam Seth via mahadev) - Merging r1212212 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212213 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 01:44:04 +00:00
Mahadev Konar 740e269b8f MAPREDUCE-3147. Handle leaf queues with the same name properly. (Ravi Prakash via mahadev) - Merging r1211243 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1211247 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 00:39:22 +00:00
Mahadev Konar 63c0db36e2 MAPREDUCE-3485. DISKS_FAILED -101 error code should be defined in same location as ABORTED_CONTAINER_EXIT_STATUS. (Ravi Gummadi via mahadev) - Merging r1210192 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210194 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 20:12:41 +00:00
Mahadev Konar 7fd4dce613 MAPREDUCE-3456. $HADOOP_PREFIX/bin/yarn should set defaults for $HADOOP_*_HOME (Eric Payne via mahadev) - Merging r1209825 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209826 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 03:44:01 +00:00
Siddharth Seth e5822af421 merge -c 1209759 from trunk. MAPREDUCE-3453
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209764 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:53:17 +00:00
Siddharth Seth 1912f4c7b8 mrege MAPREDUCE-3460 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209740 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:22:01 +00:00
Mahadev Konar a7b206219c MAPREDUCE-3452. fifoscheduler web ui page always shows 0% used for the queue. (Jonathan Eagles via mahadev) - Merging r1208999 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209002 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:45:43 +00:00
Mahadev Konar 2ef6051da9 MAPREDUCE-3463. Second AM fails to recover properly when first AM is killed with java.lang.IllegalArgumentException causing lost job. (Siddharth Seth via mahadev) - Merging r1208994 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208995 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:37:14 +00:00
Alejandro Abdelnur 287c0ffa51 Merge -r 1208767:1208768 from trunk to branch. FIXES: MAPREDUCE-3477
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208770 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 20:51:51 +00:00
Mahadev Konar de8f0efe60 MAPREDUCE-3121. NodeManager should handle disk-failures (Ravi Gummadi via mahadev) - Merging r1208131 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208135 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 23:28:16 +00:00
Siddharth Seth 441f6a3b05 merge MAPREDUCE-3045 from trunk. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1207717 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 00:14:54 +00:00
Mahadev Konar 7f97bed786 MAPREDUCE-3413. RM web ui applications not sorted in any order by default. (Jonathan Eagles via mahadev) - Merging r1206926 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1206928 13f79535-47bb-0310-9956-ffa450edef68
2011-11-27 23:59:31 +00:00
Mahadev Konar 9521bc3d3e MAPREDUCE-3238. Small cleanup in SchedulerApp. (Todd Lipcon via mahadev) - Merging r1206921 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1206924 13f79535-47bb-0310-9956-ffa450edef68
2011-11-27 23:45:02 +00:00
Mahadev Konar f0c0a094ff MAPREDUCE-3371. Review and improve the yarn-api javadocs. (Ravi Prakash via mahadev) - Merging r1206899 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1206909 13f79535-47bb-0310-9956-ffa450edef68
2011-11-27 23:17:09 +00:00
Tsz-wo Sze 11b908bf27 svn merge -c 1205626 from trunk for HDFS-2587.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205630 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 22:09:34 +00:00
Arun Murthy 7467e23b41 Merge -c 1205628 from trunk to branch-0.23 to fix MAPREDUCE-3265.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205629 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 22:06:47 +00:00
Arun Murthy 7b2940190d Merge -c 1205260 from trunk to branch-0.23 to fix MAPREDUCE-3329.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205261 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 01:46:10 +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
Mahadev Konar 9d1586e10a MAPREDUCE-3411. Performance Upgrade for jQuery (Jonathan Eagles via mahadev) - Merging r1205210 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205213 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 22:48:38 +00:00
Mahadev Konar 951db7edc3 MAPREDUCE-3408. yarn-daemon.sh unconditionnaly sets yarn.root.logger (Bruno Mahe via mahadev) - Merging r1205200 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205201 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 22:34:22 +00:00
Thomas White 90158a3ec2 Merge -r 1203454:1203455 from trunk to branch-0.23. Fixes: MAPREDUCE-3373
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203458 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 01:01:20 +00:00
Alejandro Abdelnur a24139e043 Merge -r 1203410:1203411 from trunk to branch. FIXES: MAPREDUCE-3415
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203415 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 23:10:37 +00:00
Vinod Kumar Vavilapalli 7b8e41d6a1 MAPREDUCE-3407. Fixed pom files to refer to the correct MR app-jar needed by the integration tests. Contributed by Hitesh Shah.
svn merge -c r1202766 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202768 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 16:31:37 +00:00
Vinod Kumar Vavilapalli 0e3715e98f MAPREDUCE-3102. Changed NodeManager to fail fast when LinuxContainerExecutor has wrong configuration or permissions. Contributed by Hitesh Shah.
svn merge -c r1202117 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202118 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 10:32:55 +00:00
Mahadev Konar 7934940eb8 MAPREDUCE-3331. Improvement to single node cluster setup documentation for 0.23 (Anupam Seth via mahadev) - Merging r1202002 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202004 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 02:06:52 +00:00
Mahadev Konar 6aa52c35d3 MAPREDUCE-3341. Enhance logging of initalized queue limit values. (Anupam Seth via mahadev) - Merging r1201947 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201949 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 22:40:53 +00:00
Mahadev Konar 526e738813 MAPREDUCE-3325. Improvements to CapacityScheduler doc. (Thomas Graves via mahadev) - Merging r1201925 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201927 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 22:02:02 +00:00
Mahadev Konar 686975c9fb MAPREDUCE-3324. Not All HttpServer tools links (stacks,logs,config,metrics) are accessible through all UI servers (Jonathan Eagles via mahadev) - Merging r1201914 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201916 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 21:31:38 +00:00
Vinod Kumar Vavilapalli 838bb254fe MAPREDUCE-3370. Fixed MiniMRYarnCluster and related tests to not use a hard-coded path for the mr-app jar. Contributed by Ahmed Radwan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200776 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 08:53:47 +00:00
Vinod Kumar Vavilapalli 5c88a335b4 MAPREDUCE-3379. Fixed LocalResourceTracker in NodeManager to remove deleted cache entries correctly. Contributed by Siddharth Seth.
svn merge -c r1200747 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200748 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 06:32:23 +00:00
Vinod Kumar Vavilapalli cfbea52bd9 MAPREDUCE-3333. Fixed bugs in ContainerLauncher of MR AppMaster due to which per-container connections to NodeManager were lingering long enough to hit the ulimits on number of processes. (vinodkv)
svn merge -c r1199751 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199757 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 13:45:02 +00:00
Vinod Kumar Vavilapalli e430e1a921 MAPREDUCE-3336. Replaced guice internal.Preconditions api usage with the public Preconditions API. Contributed by Thomas Graves.
svn merge -c r1199714 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199716 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 12:42:27 +00:00
Vinod Kumar Vavilapalli 7db30f8428 MAPREDUCE-3345. Fixed a race condition in ResourceManager that was causing TestContainerManagerSecurity to fail sometimes. Contributed by Hitesh Shah.
svn merge -c r1199144 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199145 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 07:57:23 +00:00
Mahadev Konar 4657411161 MAPREDUCE-3291. App fail to launch due to delegation token not found in cache (Robert Evans via mahadev) -Merging r1198583 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1198585 13f79535-47bb-0310-9956-ffa450edef68
2011-11-06 23:04:35 +00:00
Vinod Kumar Vavilapalli b793e277aa MAPREDUCE-3297. Moved log related components into yarn-common so that HistoryServer and clients can use them without depending on the yarn-server-nodemanager module. Contributed by Siddharth Seth.
svn merge -c r1196986 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196988 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 08:07:16 +00:00
Arun Murthy 46d9ffc886 Merge -c 1196977 from trunk to branch-0.23 to fix MAPREDUCE-3337.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196978 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 07:08:33 +00:00
Arun Murthy 60c70eb6d9 Merge -r 1196410:1196412 from trunk to branch-0.23 to fix HADOOP-7789.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196413 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 00:52:20 +00:00
Arun Murthy 74cc0b509a Merge -c 1195876 from trunk to branch-0.23 to fix HADOOP-7789.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195878 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 08:55:10 +00:00
Thomas White 92fd345d14 Merge -r 1195816:1195817 from trunk to branch-0.23. Fixes: HADOOP-7782.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195821 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 04:53:00 +00:00
Mahadev Konar 61e69297d9 MAPREDUCE-3316. Rebooted link is not working properly. (Bhallamudi Venkata Siva Kamesh via mahadev) - Merging r1195805 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195806 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 04:09:13 +00:00
Arun Murthy e6f85573e7 Merge -c 1195792 from trunk to branch-0.23 to fix MAPREDUCE-3237.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195793 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 03:19:48 +00:00
Arun Murthy 76224deb1a Merge -c 1195764 from trunk to branch-0.23 to fix MAPREDUCE-3322.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195765 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 02:01:54 +00:00
Arun Murthy d6d2ff8206 Merge -c 1195579 from trunk to branch-0.23 to fix MAPREDUCE-3275.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195581 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 17:34:25 +00:00
Vinod Kumar Vavilapalli 539db85f7d MAPREDUCE-3262. Fixed Container's state-machine in NodeManager to handle a couple of events in failure states correctly. Contributed by Hitesh Shah and Siddharth Seth.
svn merge -c r1195416 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195417 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 11:30:56 +00:00
Vinod Kumar Vavilapalli cee984b9b3 MAPREDUCE-2696. Fixed NodeManager to cleanup logs in a thread when logs' aggregation is not enabled. Contributed by Siddharth Seth.
svn merge -c r1195383 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195387 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 10:00:55 +00:00
Vinod Kumar Vavilapalli 4b4b1c89cc MAPREDUCE-3146. Added a MR specific command line to dump logs for a given TaskAttemptID. Contributed by Siddharth Seth.
svn merge -c r1195349 --ignore-ancestry ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195353 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 06:48:08 +00:00
Vinod Kumar Vavilapalli 8c3065c971 MAPREDUCE-2766. Fixed NM to set secure permissions for files and directories in distributed-cache. Contributed by Hitesh Shah.
svn merge -c r1195340 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195341 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 05:53:14 +00:00
Arun Murthy e978faf658 Adding executable svn prop on mock-container-executor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195337 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 05:29:46 +00:00
Vinod Kumar Vavilapalli 5175fc6e77 MAPREDUCE-3313. Fixed initialization of ClusterMetrics which was failing TestResourceTrackerService sometimes. Contributed by Hitesh Shah.
svn merge -c r1195319 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195320 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 03:33:42 +00:00
Mahadev Konar f3fb6017e8 MAPREDUCE-3171 merge from trunk reverted changes from MAPREDUCE-2747 MAPREDUCE-3240.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195257 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 21:45:45 +00:00
Arun Murthy 6f2f253446 Merge -c 1194850 from trunk to branch-0.23 to fix MAPREDUCE-3256.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1194851 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 09:37:02 +00:00
Thomas White 1d54c6e5a7 Merge -r 1190702:1190703 from trunk to branch-0.23. Fixes: HADOOP-7763.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190706 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 00:17:58 +00:00
Alejandro Abdelnur 954b0ff8ab Merge -r 1188475:1188476 from trunk to branch. FIXES: MAPREDUCE-3248
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190671 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:30:05 +00:00
Alejandro Abdelnur 073139bb57 Merge -r 1185966:1185967 from trunk to branch. FIXES: MAPREDUCE-3199
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190667 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:14:55 +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
Alejandro Abdelnur d81d704d2e Merge -r 1182574:1182575 from trunk to branch. FIXES: MAPREDUCE-3171
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190619 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 22:03:21 +00:00
Alejandro Abdelnur f00b853e6b Merge -r 1182150:1182151 from trunk to branch. FIXES: HADOOP-7642
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190616 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 21:57:38 +00:00
Alejandro Abdelnur 2d06ac8a28 Merge -r 1180115:1180116 from trunk to branch. FIXES: MAPREDUCE-3014
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190594 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 21:34:14 +00:00
Mahadev Konar bd6a83f5d3 MAPREDUCE-3295. TestAMAuthorization failing on branch 0.23. (vinodkv via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190528 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 20:00:54 +00:00
Vinod Kumar Vavilapalli c4cf38dfc2 MAPREDUCE-3306. Fixed a bug in NodeManager ApplicationImpl that was causing NodeManager to crash. (vinodkv)
svn merge -c r1190523 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190526 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 19:53:00 +00:00
Vinod Kumar Vavilapalli e20f1826f3 MAPREDUCE-2775. Fixed ResourceManager and NodeManager to force a decommissioned node to shutdown. Contributed by Devaraj K.
svn merge -c r1190467 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190468 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 17:40:45 +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
Vinod Kumar Vavilapalli fc8079e054 MAPREDUCE-2989. Modified JobHistory to link to task and AM logs from the JobHistoryServer. Contributed by Siddharth Seth.
svn merge -c r1190174 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 06:52:40 +00:00
Mahadev Konar 404817b294 MAPREDUCE-3185. RM Web UI does not sort the columns in some cases. (Jonathan Eagles via mahadev) - Merging r1190165 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190166 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 06:06:35 +00:00
Arun Murthy eb8b480e95 Merge -c 1190162 from trunk to branch-0.23 to fix MAPREDUCE-3290.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190163 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 05:46:28 +00:00
Mahadev Konar 33f5d87591 MAPREDUCE-3285. Tests on branch-0.23 failing (Siddharth Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190138 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 02:25:57 +00:00
Vinod Kumar Vavilapalli ecab39be64 MAPREDUCE-3281. Fixed one more bug due to which TestLinuxContainerExecutorWithMocks was failing. (vinodkv)
svn merge -c r1190007 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190009 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 20:40:06 +00:00
Vinod Kumar Vavilapalli 4f1d9492f0 MAPREDUCE-3281. Fixed a bug in TestLinuxContainerExecutorWithMocks. (vinodkv)
svn merge -c r1189818 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189819 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 15:57:06 +00:00
Vinod Kumar Vavilapalli 1f42531bce MAPREDUCE-3240. Fixed NodeManager to be able to forcefully cleanup its containers (process-trees) irrespective of whether the container succeeded, or killed. Contributed by Hitesh Shah.
Added the new files which I missed earlier.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189815 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 15:52:43 +00:00
Vinod Kumar Vavilapalli 28676b5345 MAPREDUCE-2986. Fixed MiniYARNCluster to support multiple NodeManagers. Contributed by Anupam Seth.
svn merge -c r1189721 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189723 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 12:44:57 +00:00
Vinod Kumar Vavilapalli c5028eaa38 MAPREDUCE-3240. Fixed NodeManager to be able to forcefully cleanup its containers (process-trees) irrespective of whether the container succeeded, or killed. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189713 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 12:06:08 +00:00
Arun Murthy e18d2cdb31 Merge -c 1189667 from trunk to branch-0.23 to fix MAPREDUCE-3259.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189668 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 08:29:40 +00:00
Arun Murthy 23eb484fa1 Merge -c 1189630 from trunk to branch-0.23 to fix MAPREDUCE-3257.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189631 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 06:25:07 +00:00
Arun Murthy 6954b24c9d Merge -c 1189619 from trunk to branch-0.23 to fix MAPREDUCE-3175.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189628 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 06:21:30 +00:00
Arun Murthy ea7c670969 Merge -c 1189542 from trunk to branch-0.23 to fix MAPREDUCE-3205.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189543 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 23:59: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
Arun Murthy b0384fc087 Merge -c 1189012 from trunk to branch-0.23 to complete fix for MAPREDUCE-2977.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189013 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 02:58:00 +00:00
Arun Murthy 4dd5c3169d Merge -c 1188999 from trunk to branch-0.23 to complete fix for MAPREDUCE-3269.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189000 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 02:17:05 +00:00
Mahadev Konar ddccefbefb MAPREDUCE-2746. Yarn servers can't communicate with each other with hadoop.security.authorization set to true (acmurthy via mahadev) - Merging r1188522 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188524 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 06:12:14 +00:00
Todd Lipcon 635d78c25f Amend MAPREDUCE-3159. Fix JavaDoc warnings in previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188478 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 01:13:55 +00:00
Arun Murthy 88c24ca831 Merge -c 1188466 from trunk to branch-0.23 to complete fix for MAPREDUCE-3159.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188468 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 00:42:56 +00:00
Vinod Kumar Vavilapalli df7a66844b MAPREDUCE-2747. Cleaned up LinuxContainerExecutor binary sources and changed the configuration to use yarn names. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188261 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 17:59:30 +00:00
Mahadev Konar abae89ed32 MAPREDUCE-3242. Trunk compilation broken with bad interaction from MAPREDUCE-3070 and MAPREDUCE-3239. (mahadev) - Merging r1187587 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187589 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 22:48:29 +00:00
Mahadev Konar cbd1258918 MAPREDUCE-3239. Use new createSocketAddr API in MRv2 to give better error messages on misconfig (Todd Lipcon via mahadev) - Merging r1187556 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187558 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 21:38:45 +00:00
Arun Murthy 59348f53a1 Merge -c 1187496 from trunk to branch-0.23 to complete fix for MAPREDUCE-3070.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187497 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 18:48:07 +00:00
Mahadev Konar 1edb5c8f9e MAPREDUCE-3163. JobClient spews errors when killing MR2 job. (mahadev) - Merging r1187491 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187492 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 18:38:26 +00:00
Vinod Kumar Vavilapalli 9a8b923418 MAPREDUCE-3104. Implemented Application-acls. (vinodkv)
svn merge -c r1186748 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186754 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 12:01:54 +00:00
Suresh Srinivas 50ad8ec904 HDFS-2471. Add documentation for HDFS federation feature. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186579 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 00:29:12 +00:00
Arun Murthy ffccd70d7a Merge -c 1186554 from trunk to branch-0.23 to complete fix for MAPREDUCE-3188.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186555 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 23:00:07 +00:00
Arun Murthy 797ee4c4d3 Merge -c 1186546 from trunk to branch-0.23 to complete fix for MAPREDUCE-3212.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186547 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:43:27 +00:00
Arun Murthy c56916f582 Merge -c 1186542 from trunk to branch-0.23 to complete fix for MAPREDUCE-3208.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186544 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:38:53 +00:00
Arun Murthy 9895a6353b Merge -c 1186467 from trunk to branch-0.23 to complete fix for MAPREDUCE-2788.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186468 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 20:37:51 +00:00
Vinod Kumar Vavilapalli db1c89fd51 MAPREDUCE-3162. Separated application-init and container-init event types in NodeManager's Application state machine. Contributed by Todd Lipcon.
svn merge -c r1185988 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185990 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 06:42:38 +00:00
Vinod Kumar Vavilapalli e3b9d11da8 MAPREDUCE-3144. Augmented JobHistory with the information needed for serving aggregated logs. Contributed by Siddharth Seth.
svn merge -c r1185976 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185977 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 05:28:22 +00:00
Arun Murthy a990576916 Merge -c 1185880 from trunk to branch-0.23 to complete fix for MAPREDUCE-2762.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185881 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:38:08 +00:00
Arun Murthy df93e27dd6 Merge -c 1185447 from trunk to branch-0.23 to complete fix for MAPREDUCE-3068.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185448 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 01:23:14 +00:00
Mahadev Konar 203f3e1362 MAPREDUCE-3196. TestLinuxContainerExecutorWithMocks fails on Mac OSX. (Arun Murthy via mahadev) - Merging r1185417 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185419 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 22:44:16 +00:00
Arun Murthy 1ae4238dc2 Merge -c 1184989 from trunk to branch-0.23 to complete fix for MAPREDUCE-3101.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184990 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 04:09:35 +00:00
Arun Murthy 6a1deabbb7 Merge -c 1184981 from trunk to branch-0.23 to complete fix for MAPREDUCE-3136.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184982 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 02:35:57 +00:00
Mahadev Konar 545a030839 MAPREDUCE-3189. Add link decoration back to MR2's CSS. (Todd Lipcon via mahadev) - Merging r1184979 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184980 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 02:24:41 +00:00
Arun Murthy bcd86749b6 Merge -c 1184977 from trunk to branch-0.23 to fix MAPREDUCE-3136.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184978 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 02:18:58 +00:00
Arun Murthy 4e236a87e5 Merge -c 1184975 from trunk to branch-0.23 to fix MAPREDUCE-3190.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184976 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 02:14:55 +00:00
Mahadev Konar 065ca399c8 MAPREDUCE-3187. Add names for various unnamed threads in MR2. (Todd Lipcon and Siddharth Seth via mahadev) - Merging r1184904 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184905 13f79535-47bb-0310-9956-ffa450edef68
2011-10-16 19:30:13 +00:00
Jitendra Nath Pandey 0672834f2d Merged r1183187 from trunk for MAPREDUCE-2764.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183576 13f79535-47bb-0310-9956-ffa450edef68
2011-10-15 01:16:34 +00:00
Mahadev Konar 1caff31a74 MAPREDUCE-3059. QueueMetrics do not have metrics for aggregate containers-allocated and aggregate containers-released. (Devaraj K via mahadev) - Merging r1183540 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183542 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 22:42:01 +00:00
Mahadev Konar 66aca6d25d MAPREDUCE-3133. Running a set of methods in a Single Test Class. (Jonathan Eagles via mahadev) - Merging r1182688 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182691 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 07:08:30 +00:00
Arun Murthy c2ae3d6e36 Merge -c 1182616 from trunk to branch-0.23 to fix MAPREDUCE-2789.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182617 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 23:29:53 +00:00
Vinod Kumar Vavilapalli b8a90a2853 MAPREDUCE-3140. Fixed the invalid JobHistory URL for failed applications. Contributed by Subroto Sanyal.
svn merge -c r1182216 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182218 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 06:25:03 +00:00
Arun Murthy 591b080e98 Merge -c 1182000 from trunk to branch-0.23 to fix MAPREDUCE-3126.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182003 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 18:25:07 +00:00
Vinod Kumar Vavilapalli 73b6474bac MAPREDUCE-2668. Fixed AuxServices to send a signal on application-finish to all the services. Contributed by Thomas Graves.
svn merge -c r1181803 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181807 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 14:29:50 +00:00
Vinod Kumar Vavilapalli ddaf7c8a7f MAPREDUCE-3161. svn merge -c r1181622 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181623 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 04:47:28 +00:00
Vinod Kumar Vavilapalli 446be91d0d MAPREDUCE-2988. svn merge -c r1180833 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180835 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 09:20:49 +00:00
Arun Murthy 87f567f1dc Merge -c 1180772 from trunk to branch-0.23 to fix MAPREDUCE-3123.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180773 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 03:27:38 +00:00
Arun Murthy c4c9b7edc7 Merge -c 1180767 from trunk to branch-0.23 to fix MAPREDUCE-2876.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180768 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 03:07:21 +00:00
Vinod Kumar Vavilapalli 7be1d43cdc MAPREDUCE-2751. svn merge -c r1180071 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180073 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 15:26:22 +00:00
Vinod Kumar Vavilapalli b1282883cc MAPREDUCE-2783. svn merge -c r1179975 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179978 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 09:23:42 +00:00
Mahadev Konar 02bc9ecf9b MAPREDUCE-2794. [MR-279] Incorrect metrics value for AvailableGB per queue per user. (John George via mahadev) - Merging r1179936 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179937 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 05:34:51 +00:00
Vinod Kumar Vavilapalli 90674a233a MAPREDUCE-2738. svn merge -c r1179229 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179232 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 14:07:08 +00:00
Vinod Kumar Vavilapalli 8ccbd7d135 MAPREDUCE-2907. svn merge -c r1179178 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179181 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 11:58:41 +00:00
Vinod Kumar Vavilapalli c4148c8db1 MAPREDUCE-3013. svn merge -c r1179174 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 11:47:00 +00:00
Arun Murthy 9efc5089de Merge -r 1178630:1178631 from trunk to branch-0.23 to fix MAPREDUCE-2792.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178633 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 23:23:04 +00:00
Arun Murthy d564b4d799 Merge -r 1178529:1178530 from trunk to branch-0.23 to fix MAPREDUCE-3134.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178531 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 19:36:32 +00:00
Arun Murthy d8da0542dd MAPREDUCE-3137. Fix broken merge of MAPREDUCE-2179. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178524 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 19:25:40 +00:00
Arun Murthy 797671f3fb Merge -r 1177919:1177920 from trunk to branch-0.23 to fix MAPREDUCE-2889.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177921 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 05:24:06 +00:00
Arun Murthy 714d8fbeb2 Merge -r 1177873:1177874 from trunk to branch-0.23 to fix MAPREDUCE-3113.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177875 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 00:00:04 +00:00
Arun Murthy d2bf75aec0 Merge -r 1177863:1177864 from trunk to branch-0.23 to fix MAPREDUCE-2719.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177865 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 22:26:58 +00:00
Arun Murthy 4854989c46 Merge -r 1177858:1177859 from trunk to branch-0.23 to fix MAPREDUCE-3050.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177861 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 22:20:11 +00:00
Vinod Kumar Vavilapalli 908f1d5d01 MAPREDUCE-3098. svn merge -c r1177633 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177639 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 12:54:53 +00:00
Vinod Kumar Vavilapalli 034d0d8fee MAPREDUCE-3114. svn merge -c r1177187 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177190 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 07:33:36 +00:00
Arun Murthy e6f5bf6dd8 Merge -r 1176761:1176762 from trunk to branch-0.23 to fix MAPREDUCE-3078.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176763 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 07:32:22 +00:00
Vinod Kumar Vavilapalli 456e6e1de6 MAPREDUCE-3110. svn merge -c r1176739 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176740 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 06:04:54 +00:00
Vinod Kumar Vavilapalli c0bcd07330 MAPREDUCE-2843. svn merge -c r1176730 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176731 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 05:37:30 +00:00
Arun Murthy f67abbdbf6 Merge -r 1176714:1176715 from trunk to branch-0.23 to fix MAPREDUCE-3041.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176718 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 04:25:19 +00:00
Arun Murthy f774d36921 Merge -r 1176707:1176708 from trunk to branch-0.23 to fix MAPREDUCE-3021.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176709 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 04:03:50 +00:00
Arun Murthy eb30a784d1 Merge -r 1176680:1176681 from trunk to branch-0.23 to fix MAPREDUCE-3021.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176683 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 01:25:32 +00:00
Mahadev Konar c7a11af6df MAPREDUCE-3099. Add docs for setting up a single node MRv2 cluster. (mahadev) - Merging r1176607 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176610 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 20:43:43 +00:00
Mahadev Konar 8203f69ebc MAPREDUCE-3054. Unable to kill submitted jobs. (mahadev) - Merging r1176600 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176604 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 20:36:20 +00:00
Vinod Kumar Vavilapalli a865e684c0 MAPREDUCE-2999. svn merge -c r1176469 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176470 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 17:06:16 +00:00
Arun Murthy 7bc49fa3fb Merge -r 1176234:1176235 from trunk to branch-0.23 to fix MAPREDUCE-3067.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176236 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 06:59:35 +00:00
Arun Murthy 72e518889f Merge -r 1176044:1176045 from trunk to branch-0.23 to fix MAPREDUCE-2984.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176046 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 20:46:28 +00:00
Vinod Kumar Vavilapalli cf8e553ab3 MAPREDUCE-3031. svn merge -c r1175960 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175964 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 17:31:47 +00:00
Vinod Kumar Vavilapalli 8a01676b92 MAPREDUCE-2646. svn merge -c r1175859 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175861 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 13:29:26 +00:00
Vinod Kumar Vavilapalli 6b6e177b70 MAPREDUCE-2952. svn merge -c r1175403 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175408 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 14:54:00 +00:00
Arun Murthy 70d6537d39 Merge -r 1175356:1175357 from trunk to branch-0.23 to fix MAPREDUCE-3053.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175359 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 09:51:09 +00:00
Vinod Kumar Vavilapalli 2377d1697f MAPREDUCE-3055. svn merge -c r1174785 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1174792 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 14:12:27 +00:00
Mahadev Konar 9b93426833 MAPREDUCE-3044. Pipes jobs stuck without making progress. (mahadev) - Merging -r1173909 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173910 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 23:54:44 +00:00
Arun Murthy 6f62a83a31 Merge -r 1173903:1173904 from trunk to branch-0.23 to fix MAPREDUCE-3066.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173905 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 23:34:16 +00:00
Arun Murthy 695a8c75f7 Merge -r 1173837:1173838 from trunk to branch-0.23 to fix MAPREDUCE-3062.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173839 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 20:37:42 +00:00
Vinod Kumar Vavilapalli 01da4430d2 MAPREDUCE-2880. svn merge -c r1173783 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173792 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 18:52:27 +00:00
Vinod Kumar Vavilapalli 9a8f4b655a MAPREDUCE-2930. svn merge -c r1173524 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173525 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 08:40:17 +00:00
Arun Murthy 38a4915dab Merge -r 1173452:1173453 from trunk to branch-0.23 to fix MAPREDUCE-3036.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173454 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 01:15:19 +00:00
Mahadev Konar e2ba4d85dc MAPREDUCE-3017. The Web UI shows FINISHED for killed/successful/failed jobs. (mahadev) - Merging r1172906 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172910 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 00:02:22 +00:00
Mahadev Konar 34797aac75 MAPREDUCE-3038. job history server not starting because conf() missing HsController (Jeffrey Naisbitt via mahadev) - merging r1172875 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172879 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 22:53:46 +00:00
Arun Murthy ec1a930822 Merge -r 1172846:1172847 from trunk to branch-0.23 to fix MAPREDUCE-3042.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172848 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 21:31:56 +00:00
Vinod Kumar Vavilapalli 88c81313e9 MAPREDUCE-3030. svn merge -c r1172638 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172639 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 14:19:28 +00:00
Vinod Kumar Vavilapalli 08688dc543 MAPREDUCE-2965. svn merge -c r1172214 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172218 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 08:17:08 +00:00
Vinod Kumar Vavilapalli 00e80b9dfa MAPREDUCE-2965. svn merge -c r1172212 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172215 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 08:10:02 +00:00
Arun Murthy 9146f43c8d Merge -r 1171900:1171901 from trunk to branch-0.23 to fix MAPREDUCE-2987.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171902 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 05:53:28 +00:00
Vinod Kumar Vavilapalli d7170579ea MAPREDUCE-2994. svn merge -c r1171485 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171486 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 10:10:38 +00:00
Mahadev Konar 66ad5a6154 MAPREDUCE-2672. MR-279: JobHistory Server needs Analysis this job. (Robert Evans via mahadev) - Merging r1171297 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171299 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 22:23:11 +00:00
Arun Murthy a19a6f01ba Merge -r 1170878:1170879 from trunk to branch-0.23 to fix MAPREDUCE-3005.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170880 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 22:47:50 +00:00
Vinod Kumar Vavilapalli 3e8f0b3c8e MAPREDUCE-2966. svn merge -c r1170746 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 18:01:53 +00:00
Vinod Kumar Vavilapalli e1bc3c3f7d MAPREDUCE-2949. svn merge -c r1170689 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170690 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 15:38:29 +00:00
Mahadev Konar 90a5181501 MAPREDUCE-2899. Replace major parts of ApplicationSubmissionContext with a ContainerLaunchContext (Arun Murthy via mahadev) - Merging r1170459 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170460 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 07:29:45 +00:00
Mahadev Konar cc9369f691 MAPREDUCE-2676. MR-279: JobHistory Job page needs reformatted. (Robert Evans via mahadev) - Merging r1170379 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170380 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 22:57:59 +00:00
Arun Murthy cd7c0749ca fMerge -r 1170278:1170279 from trunk to branch-0.23 to fix MAPREDUCE-2995.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170280 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 18:13:05 +00:00
Arun Murthy 677c212467 Merge -r 1169979:1169980 from trunk to branch-0.23 to fix MAPREDUCE-2896.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169981 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 00:07:09 +00:00
Arun Murthy 6ad35c6378 Merge -r 1169972:1169973 from trunk to branch-0.23 to fix MAPREDUCE-2874.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169974 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 23:18:30 +00:00
Arun Murthy 6bec78654c Merge -r 1169954:1169955 from trunk to branch-0.23 to fix MAPREDUCE-2985.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169956 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 21:54:32 +00:00
Vinod Kumar Vavilapalli a7b3a14363 MAPREDUCE-2675. svn merge -c r1169763 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169767 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 14:28:02 +00:00
Arun Murthy 3b620d1eca Merge -r 1169620:1169621 from trunk to branch-0.23 to fix MAPREDUCE-2749.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169623 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 07:13:46 +00:00
Arun Murthy cbd0ddfebe Merge -r 1169483:1169484 from trunk to branch-0.23 to fix MAPREDUCE-2933.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169485 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 17:28:08 +00:00
Vinod Kumar Vavilapalli 6814d04c3e MAPREDUCE-2691. svn merge -c r1167676 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1167677 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 06:29:05 +00:00
Vinod Kumar Vavilapalli 23b9aea740 MAPREDUCE-2954. svn merge -c r1167061 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1167063 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 09:51:55 +00:00
Arun Murthy 1b316b7707 Merge -r 1166967:1166968 from trunk to branch-0.23 to fix MAPREDUCE-2953.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166969 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 02:20:03 +00:00
Arun Murthy 4ffba53aca fMerge -r 1166957:1166958 from trunk to branch-0.23 to fix MAPREDUCE-2690.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166959 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 02:05:55 +00:00
Arun Murthy 3dd8d9476b Merge -r 1166954:1166955 from trunk to branch-0.23 to fix MAPREDUCE-2864.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166957 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 01:58:40 +00:00
Arun Murthy 2df748af75 Merge -r 1166900:1166901 from trunk to branch-0.23 to fix MAPREDUCE-2677.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166904 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 21:04:17 +00:00
Arun Murthy a67a1c0e04 Merge -r 1166854:1166856 from trunk to branch-0.23 to fix MAPREDUCE-2844.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166858 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:50:32 +00:00
Arun Murthy 666a581924 Merge -r 1166848:1166849 from trunk to branch-0.23 to fix MAPREDUCE-2947.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166851 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:41:07 +00:00
Arun Murthy dc896c8bc6 Merge -r 1166837:1166838 from trunk to branch-0.23 to fix MAPREDUCE-2908.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166840 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:28:14 +00:00
Arun Murthy 210eb9ee47 Merge -r 1166005:1166006 from trunk to branch-0.23 to fix MAPREDUCE-2938.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166007 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 05:56:05 +00:00
Arun Murthy c1e1e0857d Merge -r 1165948:1165950 from trunk to branch-0.23 to fix MAPREDUCE-2655.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165951 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 01:27:16 +00:00
Arun Murthy 2afd149137 Merge -r 1165932:1165933 from trunk to branch-0.23 to fix MAPREDUCE-2774.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165935 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 23:41:30 +00:00
Arun Murthy 301e322096 Merge -r 1165889:1165890 from trunk to branch-0.23 to fix MAPREDUCE-2687.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165891 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 21:50:44 +00:00
Arun Murthy 574aa2b2f5 Merge -r 1165402:1165403 from trunk to branch-0.23 to fix MAPREDUCE-2697.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165404 13f79535-47bb-0310-9956-ffa450edef68
2011-09-05 19:54:46 +00:00
Arun Murthy d652391131 Merge -r 1164300:1164301 from trunk to branch-0.23 to fix MAPREDUCE-2735.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164302 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 23:59:05 +00:00
Aaron Myers 8019d90630 HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164179 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 17:24:05 +00:00
Arun Murthy 2572c7c434 Merge -r 1163767:1163768 from trunk to branch-0.23 to fix MAPREDUCE-2917.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163769 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 19:54:16 +00:00
Vinod Kumar Vavilapalli 464486bee3 MAPREDUCE-2652. svn merge -c r1163585 --ignore-ancestry trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163626 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 14:07:25 +00:00
Arun Murthy ea92e62344 Merge -r 1163068:1163069 from trunk to branch-0.23 to fix MAPREDUCE-2897.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163070 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 01:23:54 +00:00