big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,837 Commits 2 Branches 2 Tags 264 MiB
32cc3139e3
Commit Graph

2090 Commits

Author SHA1 Message Date
Tsuyoshi Ozawa
a6ed4894b5 HADOOP-11032. Replace use of Guava's Stopwatch with Hadoop's StopWatch. (ozawa) 2015-01-08 14:51:57 +09:00
Tsuyoshi Ozawa
9886396400 Revert "Replace use of Guava's Stopwatch with Hadoop's StopWatch. (ozawa)" because of missing JIRA's number. 
This reverts commit 2eba7eb9af.
 2015-01-08 14:35:08 +09:00
Tsuyoshi Ozawa
2eba7eb9af Replace use of Guava's Stopwatch with Hadoop's StopWatch. (ozawa) 2015-01-08 14:21:30 +09:00
Jason Lowe
a0aeed100b MAPREDUCE-6206. TestAggregatedTransferRate fails on non-US systems. Contributed by Jens Rabe 2015-01-06 23:39:43 +00:00
Jason Lowe
d02fb53750 HADOOP-11445. Bzip2Codec: Data block is skipped when position of newly created stream is equal to start of split. Contributed by Ankit Kamboj 2015-01-06 21:19:10 +00:00
Harsh J
6621c3598e MAPREDUCE-6149. Document override log4j.properties in MR job. Contributed by Junping Du. 2014-12-30 23:12:51 +05:30
Jian He
808cba3821 YARN-2952. Fixed incorrect version check in StateStore. Contributed by Rohith Sharmaks 2014-12-19 16:56:30 -08:00
Robert Kanter
390a7c12f5 MAPREDUCE-6199. AbstractCounters are not reset completely on deserialization (adhoot via rkanter) 2014-12-19 15:43:48 -08:00
Karthik Kambatla
6f1e3667cf HADOOP-11213. Typos in html pages: SecureMode and EncryptedShuffle. (Wei Yan via kasha) 2014-12-19 15:00:28 -08:00
Robert Kanter
d9e4d67d18 MAPREDUCE-6045. need close the DataInputStream after open it in TestMapReduce.java (zxu via rkanter) 2014-12-19 11:59:22 -08:00
Eric Yang
c379e102dd MAPREDUCE-6191. Improve clearing stale state of Java serialization 
testcase.  (Sam Liu via Eric Yang)
 2014-12-15 19:39:41 -08:00
Gera Shegalov
af006937e8 MAPREDUCE-6166. Reducers do not validate checksum of map outputs when fetching directly to disk. (Eric Payne via gera) 2014-12-15 19:08:59 -08:00
Jian He
a4f2995b9e Revert "YARN-2890. MiniYARNCluster should start the timeline server based on the configuration. Contributed by Mit Desai." 
This reverts commit 51af8d367d.

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-12-15 11:04:09 -08:00
Harsh J
298d09c9b5 MAPREDUCE-6194. Bubble up final exception in failures during creation of output collectors. Contributed by Varun Saxena. 2014-12-15 14:26:43 +05:30
Gera Shegalov
25a0440238 MAPREDUCE-4879. TeraOutputFormat may overwrite an existing output directory. (gera) 2014-12-13 17:52:50 -08:00
Devaraj K
0bd0229110 MAPREDUCE-6046. Change the class name for logs in RMCommunicator. 
Contributed by Sahil Takiar.
 2014-12-12 11:42:03 +05:30
Gera Shegalov
0bcea111e5 HADOOP-11211. mapreduce.job.classloader.system.classes semantics should be order-independent. (Yitong Zhou via gera) 2014-12-11 13:12:13 -08:00
Harsh J
cb99f43305 MAPREDUCE-5420. Remove mapreduce.task.tmp.dir from mapred-default.xml. Contributed by James Carman. (harsh) 2014-12-11 09:45:49 +05:30
Allen Wittenauer
c536142699 HADOOP-6590. Add a username check for hadoop sub-commands (John Smith via aw) 2014-12-10 13:41:28 -08:00
Allen Wittenauer
a7c6c710b2 HADOOP-10950. rework heap management vars (John Smith via aw) 2014-12-10 13:37:32 -08:00
Haohui Mai
be86237c09 HADOOP-11372. Fix new findbugs warnings in mapreduce-examples. Contributed by Li Lu. 2014-12-09 10:49:55 -08:00
Haohui Mai
d777a1e4ca HADOOP-11369. Fix new findbugs warnings in hadoop-mapreduce-client, non-core directories. Contributed by Li Lu. 2014-12-09 10:46:13 -08:00
Harsh J
8963515b88 MAPREDUCE-6177. Minor typo in the EncryptedShuffle document about ssl-client.xml. Contributed by Yangping Wu. (harsh) 2014-12-08 15:57:52 +05:30
Jason Lowe
03ab24aa01 MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log. Contributed by Gera Shegalov 2014-12-03 17:02:14 +00:00
Zhijie Shen
51af8d367d YARN-2890. MiniYARNCluster should start the timeline server based on the configuration. Contributed by Mit Desai. 2014-12-01 19:04:04 -08:00
Allen Wittenauer
031f980e7e HADOOP-11081. Document hadoop properties expected to be set by the shell code in *-env.sh (aw) 2014-12-01 16:21:20 -08:00
Jason Lowe
0c588904f8 MAPREDUCE-6160. Potential NullPointerException in MRClientProtocol interface implementation. Contributed by Rohith 2014-12-01 22:39:22 +00:00
Jason Lowe
2b30fb1053 MAPREDUCE-6172. TestDbClasses timeouts are too aggressive. Contributed by Varun Saxena 2014-12-01 21:51:05 +00:00
Karthik Kambatla
a655973e78 Revert "MAPREDUCE-5785. Derive heap size or mapreduce.*.memory.mb automatically. (Gera Shegalov and Karthik Kambatla via kasha)" 
This reverts commit a4df9eed05.
 2014-11-25 16:24:26 -08:00
Jian He
78f7cdbfd6 MAPREDUCE-5568. Fixed CompletedJob in JHS to show progress percentage correctly in case the number of mappers or reducers is zero. Contributed by MinJi Kim 2014-11-25 13:02:55 -08:00
Karthik Kambatla
a4df9eed05 MAPREDUCE-5785. Derive heap size or mapreduce.*.memory.mb automatically. (Gera Shegalov and Karthik Kambatla via kasha) 2014-11-21 18:36:41 -08:00
Karthik Kambatla
1e9a3f42ff Update release date for 2.5.2 2014-11-21 14:34:23 -08:00
Jonathan Eagles
c298a9a845 YARN-2375. Allow enabling/disabling timeline server per framework. (Mit Desai via jeagles) 2014-11-20 23:34:35 -06:00
Karthik Kambatla
90194ca1cb MAPREDUCE-6169. MergeQueue should release reference to the current item from key and value at the end of the iteration to save memory. (Zhihai Xu via kasha) 2014-11-20 15:36:57 -08:00
Allen Wittenauer
72c141ba96 HADOOP-11208. Replace "daemon" with better name in script subcommands (aw) 2014-11-19 14:49:29 -08:00
Devaraj K
7250b0bf91 MAPREDUCE-6049. AM JVM does not exit if MRClientService graceful shutdown 
fails. Contributed by Rohith.
 2014-11-18 22:05:13 +05:30
Jason Lowe
09b3dee122 MAPREDUCE-6162. mapred hsadmin fails on a secure cluster. Contributed by Jason Lowe 2014-11-17 22:59:59 +00:00
Jason Lowe
3baaa42945 MAPREDUCE-6161. mapred hsadmin command missing from trunk. Contributed by Allen Wittenauer 2014-11-14 21:10:06 +00:00
Ravi Prakash
1a1dcce827 MAPREDUCE-5918. LineRecordReader can return the same decompressor to CodecPool multiple times (Sergey Murylev via raviprak) 2014-11-14 03:45:53 -08:00
Arun C. Murthy
9ff7315cbe Preparing to release hadoop-2.6.0-rc1. 2014-11-13 13:02:55 -08:00
Jason Lowe
177e8090f5 MAPREDUCE-6156. Fetcher - connect() doesn't handle connection refused correctly. Contributed by Junping Du 2014-11-13 15:42:25 +00:00
cnauroth
0abb973f09 HADOOP-7984. Add hadoop --loglevel option to change log level. Contributed by Aikira AJISAKA. 2014-11-12 21:41:19 -08:00
Karthik Kambatla
68a0508728 Set the release date for 2.5.2 2014-11-10 15:22:53 -08:00
Arun C. Murthy
770cc14442 Updated CHANGES.txt to reflect hadoop-2.6.0 release dates. 2014-11-09 18:47:21 -08:00
Arun C. Murthy
43cd07b408 YARN-2830. Add backwords compatible ContainerId.newInstance constructor. Contributed by Jonathan Eagles. 2014-11-09 14:57:37 -08:00
Arun C. Murthy
6caa8100d5 HADOOP-11286. Copied LimitInputStream from guava-0.14 to hadoop to avoid issues with newer versions of guava in applications. Contributed by Christopher Tubbs. 2014-11-08 15:39:56 -08:00
Kihwal Lee
8f701ae07a MAPREDUCE-5958. Wrong reduce task progress if map output is compressed. Contributed by Emilio Coppa and Jason Lowe. 2014-11-06 15:53:40 -06:00
Jason Lowe
10f9f5101c MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with no authority in job jar path. Contributed by Gera Shegalov 2014-11-06 15:10:40 +00:00
Jian He
73068f677b MAPREDUCE-6048. Fixed TestJavaSerialization failure. Contributed by Varun Vasudev 2014-11-04 20:19:54 -08:00
Haohui Mai
d794f785de HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR and YARN. Contributed by Robert Kanter. 2014-11-04 17:52:03 -08:00
Karthik Kambatla
4de56d27fb Adding release 2.5.2 to CHANGES.txt 2014-11-04 16:50:40 -08:00
Zhijie Shen
ed63b11646 MAPREDUCE-6052. Supported overriding the default container-log4j.properties file per job. Contributed by Junping Du. 2014-11-01 00:47:57 -07:00
Vinod Kumar Vavilapalli
e0233c16eb YARN-2698. Moved some node label APIs to be correctly placed in client protocol. Contributed by Wangda Tan. 2014-10-30 22:59:31 -07:00
Kihwal Lee
b056048114 MAPREDUCE-6022. map_input_file is missing from streaming job 
environment. Contributed by Jason Lowe.
 2014-10-29 12:29:07 -05:00
Vinod Kumar Vavilapalli
3f1441245d MAPREDUCE-6142. Fixed test failures in TestJobHistoryEventHandler and TestMRTimelineEventHandling. Contributed by Zhijie Shen. 2014-10-29 09:57:39 -07:00
Karthik Kambatla
3c5f5af118 HADOOP-11243. SSLFactory shouldn't allow SSLv3. (Wei Yan via kasha) 2014-10-28 18:03:00 -07:00
Zhijie Shen
971e91c8c0 MAPREDUCE-6018. Added an MR specific config to enable emitting job history data to the timeline server. Contributed by Robert Kanter. 2014-10-27 21:03:53 -07:00
Zhijie Shen
6b2f11b54b MAPREDUCE-5933. Enabled MR AM to post history events to the timeline server. Contributed by Robert Kanter. 2014-10-27 20:35:40 -07:00
Zhijie Shen
0f3b6900be YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and made related MR changes. Contributed by Jian He. 2014-10-23 21:56:03 -07:00
Jian He
3b12fd6cfb YARN-2198. Remove the need to run NodeManager as privileged account for Windows Secure Container Executor. Contributed by Remus Rusanu 2014-10-22 15:57:46 -07:00
Jian He
d67214fd69 Updated CHANGES.txt to move MAPREDUCE-6126 to 2.6 2014-10-22 10:50:36 -07:00
Jian He
b8f7966c7a MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. Contributed by Junping Du 2014-10-22 10:43:20 -07:00
Ivan Mitic
da80c4da41 Revert "MAPREDUCE-5911. Terasort TeraOutputFormat does not check for output directory existance. Contributed by Bruno P. Kinoshita." 
This reverts commit 7bbda6ef92.
 2014-10-19 23:57:12 -04:00
Ivan Mitic
7bbda6ef92 MAPREDUCE-5911. Terasort TeraOutputFormat does not check for output directory existance. Contributed by Bruno P. Kinoshita. 2014-10-19 18:57:48 -04:00
Jason Lowe
209b1699fc MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in client. Contributed by Rohith 2014-10-17 19:51:10 +00:00
Jian He
0af1a2b5bc YARN-2312. Deprecated old ContainerId#getId API and updated MapReduce to use ContainerId#getContainerId instead. Contributed by Tsuyoshi OZAWA 2014-10-15 15:22:07 -07:00
Jason Lowe
f19771a24c MAPREDUCE-5970. Provide a boolean switch to enable MR-AM profiling. Contributed by Gera Shegalov 2014-10-15 17:50:31 +00:00
Jason Lowe
b9edad6403 MAPREDUCE-5873. Shuffle bandwidth computation includes time spent waiting for maps. Contributed by Siqi Li 2014-10-15 15:52:53 +00:00
Jason Lowe
793dbf2465 MAPREDUCE-6115. TestPipeApplication#testSubmitter fails in trunk. Contributed by Binglin Chang 2014-10-13 16:04:14 +00:00
Jason Lowe
bbe80cdc7b MAPREDUCE-6125. TestContainerLauncherImpl sometimes fails. Contributed by Mit Desai 2014-10-13 15:08:23 +00:00
Karthik Kambatla
e8a31f2e1c MAPREDUCE-5875. Make Counter limits consistent across JobClient, MRAppMaster, and YarnChild. (Gera Shegalov via kasha) 2014-10-11 22:49:06 -07:00
cnauroth
777877d079 MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth. 2014-10-09 22:35:58 -07:00
cnauroth
2f0166db56 MAPREDUCE-6122. Fix CHANGES.txt. 2014-10-09 22:32:28 -07:00
cnauroth
684170d5ef MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked out of git with incorrect line endings. Contributed by Chris Nauroth. 2014-10-09 22:25:17 -07:00
Colin Patrick Mccabe
d8d628d1e0 HADOOP-11184. Update Hadoop's lz4 to r123 (cmccabe) 2014-10-09 17:05:35 -07:00
Jason Lowe
2e789eb226 MAPREDUCE-6029. TestCommitterEventHandler fails in trunk. Contributed by Mit Desai 2014-10-07 14:10:39 +00:00
subru
3f282762d1 MAPREDUCE-6103.Adding reservation APIs to MR resource manager delegate. Contributed by Subru Krishnan and Carlo Curino. 
(cherry picked from commit aa92dd45f2d8c89a8a17ad2e4449aa3ff08bc53a)
 2014-10-03 15:42:59 -07:00
Arun C. Murthy
ea32a66f7d Preparing to branch hadoop-2.6 2014-09-30 10:26:42 -07:00
Jason Lowe
23fbfe36c3 MAPREDUCE-6094. TestMRCJCFileInputFormat.testAddInputPath() fails on trunk. Contributed by Akira AJISAKA 2014-09-29 18:12:59 +00:00
Allen Wittenauer
4666440b1a MAPREDUCE-6072. Remove INSTALL document (Akira AJISAKA via aw) 2014-09-29 08:30:06 -07:00
Jason Lowe
cf4631d7c9 HADOOP-11049. javax package system class default is too broad. Contributed by Sangjin Lee 2014-09-29 14:36:29 +00:00
Jian He
5f16c98ad6 MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by Akira AJISAKA 2014-09-26 18:05:26 -07:00
Allen Wittenauer
c7c8e388a9 MAPREDUCE-5945. Update the description of GenericOptionsParser -jt option (Akira AJISAKA via aw) 2014-09-26 14:25:49 -07:00
Allen Wittenauer
b40f433cf8 MAPREDUCE-5796. Use current version of the archive name in DistributedCacheDeploy document (Akira AJISAKA via aw) 2014-09-26 12:59:20 -07:00
Allen Wittenauer
1147b9ae16 MAPREDUCE-6073. Description of mapreduce.job.speculative.slowtaskthreshold in mapred-default should be moved into description tags (Tsuyoshi OZAWA via aw) 2014-09-26 11:16:12 -07:00
Zhijie Shen
662fc11ae7 MAPREDUCE-5831. Make MR client ignore unknown counters received from AM. Contributed by Junping Du. 2014-09-25 23:45:07 -07:00
Allen Wittenauer
6c54308423 MAPREDUCE-6093. minor distcp doc edits (Charles Lamb via aw) 2014-09-25 11:31:48 -07:00
Allen Wittenauer
f614cb71d4 MAPREDUCE-6109. Fix minor typo in distcp -p usage text (Charles Lamb via aw) 2014-09-25 11:27:33 -07:00
Allen Wittenauer
6c3cebda3f MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang) 2014-09-25 07:57:01 -07:00
Jason Lowe
7af4c3888b MAPREDUCE-6104. TestJobHistoryParsing.testPartialJob fails in branch-2. Contributed by Mit Desai 2014-09-24 16:09:33 +00:00
Allen Wittenauer
3dc28e2052 HADOOP-11092. hadoop shell commands should print usage if not given a class (aw) 2014-09-23 12:24:23 -07:00
Zhijie Shen
376233cdd4 MAPREDUCE-5279. Made MR headroom calculation honor cpu dimension when YARN scheduler resource type is memory plus cpu. Contributed by Peng Zhang and Varun Vasudev. 2014-09-22 09:28:47 -07:00
Jason Lowe
7039b98e1c MAPREDUCE-6095. Enable DistributedCache for uber-mode Jobs. Contributed by Gera Shegalov 2014-09-22 15:20:59 +00:00
Allen Wittenauer
aa1052c34b YARN-2460. Remove obsolete entries from yarn-default.xml (Ray Chiang via aw) 2014-09-19 14:07:38 -07:00
Jason Lowe
951847ba94 MAPREDUCE-6091. YARNRunner.getJobStatus() fails with ApplicationNotFoundException if the job rolled off the RM view. Contributed by Sangjin Lee 2014-09-19 20:15:54 +00:00
Zhijie Shen
6fe5c6b746 YARN-2568. Fixed the potential test failures due to race conditions when RM work-preserving recovery is enabled. Contributed by Jian He. 2014-09-18 21:56:56 -07:00
Karthik Kambatla
52945a33cc MAPREDUCE-6086. mapreduce.job.credentials.binary should allow all URIs. (Zhihai Xu via kasha) 2014-09-18 15:46:52 -07:00
Jason Lowe
2c3da25fd7 MAPREDUCE-5891. Improved shuffle error handling across NM restarts. Contributed by Junping Du 2014-09-18 22:00:11 +00:00
Andrew Wang
fe2f54d4cb HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang) 2014-09-18 14:51:08 -07:00
Jason Lowe
1cf3198047 MAPREDUCE-6090. mapred hsadmin getGroups fails to connect in some cases. Contributed by Robert Kanter 2014-09-18 21:00:53 +00:00
Allen Wittenauer
7971c97ec1 HADOOP-11022. User replaced functions get lost 2-3 levels deep (e.g., sbin) (aw) 2014-09-16 16:06:23 -07:00
Vinod Kumar Vavilapalli
14e2639fd0 YARN-611. Added an API to let apps specify an interval beyond which AM failures should be ignored towards counting max-attempts. Contributed by Xuan Gong. 2014-09-13 18:04:05 -07:00
Todd Lipcon
3c9181722b Merge MR-2841 changes into main MapReduce CHANGES.txt file 2014-09-12 18:35:13 -07:00
Todd Lipcon
8a3a327cd3 MAPREDUCE-2841. Merge remote-tracking branch 'apache/MR-2841' into trunk 2014-09-12 18:31:53 -07:00
Jian He
3122daa802 YARN-2229. Changed the integer field of ContainerId to be long type. Contributed by Tsuyoshi OZAWA 2014-09-12 10:33:33 -07:00
Karthik Kambatla
17ffbe0864 Update CHANGES.txt to set the release date for 2.5.1 2014-09-11 17:35:35 -07:00
Jason Lowe
9e28e089c6 MAPREDUCE-6070. yarn.app.am.resource.mb/cpu-vcores affects uber mode but is not documented. Contributed by Tsuyoshi OZAWA 2014-09-11 16:19:23 +00:00
Jason Lowe
7f80e14209 MAPREDUCE-6075. HistoryServerFileSystemStateStore can create zero-length files. Contributed by Jason Lowe 2014-09-10 22:22:39 +00:00
Allen Wittenauer
d989ac0444 MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other places) (Akira AJISAKA via aw) 2014-09-08 13:15:46 -07:00
Sean Zhong
52a8b4db92 MAPREDUCE-6077. native-task: Remove CustomModule examples in nativetask (seanzhong) 2014-09-06 11:46:07 +08:00
Todd Lipcon
7c91f9b148 MAPREDUCE-6074. native-task: Fix release audit warnings 2014-09-05 19:58:41 -07:00
Todd Lipcon
4b3f1e2ce4 Merge remote-tracking branch 'apache/trunk' into MR-2841 2014-09-05 10:47:27 -07:00
Todd Lipcon
683987be7c MAPREDUCE-6069. Lint/style fixes and removal of unused code. Contributed by Todd Lipcon. 2014-09-05 10:44:38 -07:00
Jason Lowe
45efc966ee MAPREDUCE-6071. JobImpl#makeUberDecision doesn't log that Uber mode is disabled because of too much CPUs. Contributed by Tsuyoshi OZAWA 2014-09-05 13:42:00 +00:00
Binglin Chang
00322161b5 MAPREDUCE-6067. native-task: fix some counter issues (Binglin Chang) 2014-09-05 14:20:39 +08:00
Chris Douglas
a18424e724 MAPREDUCE-6063. Correct spill size calculation for spills wrapping the circular buffer. Contributed by zhihai xu. 2014-09-03 17:01:59 -07:00
Todd Lipcon
1081d9cee2 MAPREDUCE-6055. native-task: findbugs, interface annotations, and other misc cleanup 2014-09-03 12:22:38 -07:00
Karthik Kambatla
ce0462129f HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha) 2014-09-03 09:39:02 -07:00
Todd Lipcon
cce7d1e2f9 Merge remote-tracking branch 'origin/trunk' into MR-2841 
Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java
 2014-09-02 15:55:54 -07:00
Binglin Chang
7ade9b04ea MAPREDUCE-6056. native-task: move system test working dir to target dir and cleanup test config xml files (Manu Zhang via bchang) 2014-09-02 16:26:09 +08:00
Binglin Chang
17cd0faace MAPREDUCE-6058. native-task: KVTest and LargeKVTest should check mr job is sucessful (Contributed by Binglin Chang) 2014-09-02 11:00:48 +08:00
Andrew Wang
ea1c6f31c2 HADOOP-11021. Configurable replication factor in the hadoop archive command. Contributed by Zhe Zhang. 2014-08-29 14:44:37 -07:00
Jason Lowe
15366d9227 MAPREDUCE-5931. Validate SleepJob command line parameters. Contributed by Gera Shegalov 2014-08-29 19:50:15 +00:00
Allen Wittenauer
d8774cc577 HADOOP-11013. CLASSPATH handling should be consolidated, debuggable (aw) 2014-08-28 18:09:25 -07:00
Chris Douglas
48aa3b7274 Fix typos in log messages. Contributed by Ray Chiang 2014-08-28 16:29:35 -07:00
Alejandro Abdelnur
d9a7404c38 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-08-28 15:10:59 -07:00
Todd Lipcon
bfd1d75d87 MAPREDUCE-6054. native-task: Speed up tests. Contributed by Todd Lipcon. 2014-08-27 12:25:49 -07:00
Todd Lipcon
fad4524c85 MAPREDUCE-5977. Fix or suppress native-task gcc warnings. Contributed by Manu Zhang. 2014-08-27 12:25:42 -07:00
Jason Lowe
812bd0c0e5 MAPREDUCE-5885. build/test/test.mapred.spill causes release audit warnings. Contributed by Chen He 2014-08-27 15:14:54 +00:00
Allen Wittenauer
9ec4a930f5 HADOOP-10996. Stop violence in the *_HOME (aw) 2014-08-27 07:00:31 -07:00
Karthik Kambatla
2d9b77d617 Fix CHANGES.txt entry for MAPREDUCE-6033. 2014-08-27 01:16:52 -07:00
Karthik Kambatla
dc154ab86d Add a section for 2.5.1 in CHANGES.txt 2014-08-27 00:55:19 -07:00
Zhijie Shen
524a63e59e MAPREDUCE-6044. Fully qualified intermediate done dir path breaks per-user dir creation on Windows. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619863 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 17:06:23 +00:00
Sanford Ryza
5109157ed1 MAPREDUCE-5130. Add missing job config options to mapred-default.xml (Ray Chiang via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619626 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 23:28:44 +00:00
Jason Darrell Lowe
da4ba50269 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619604 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 21:38:16 +00:00
Karthik Kambatla
e5e9d792c7 MAPREDUCE-5974. Allow specifying multiple MapOutputCollectors with fallback. (Todd Lipcon via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619492 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 17:37:34 +00:00
Karthik Kambatla
9b8250c742 Set the release date for 2.5.0 in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619237 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 21:33:19 +00:00
Andrew Wang
b0f0ef17f0 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619203 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 18:56:56 +00:00
Allen Wittenauer
ef32d09030 [post-HADOOP-9902] mapred version is missing (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619201 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 18:47:10 +00:00
Andrew Wang
d2a39b61aa Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619018 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 01:22:42 +00:00
Charles Lamb
14b01dd046 HDFS-6872. Fix TestOptionsParser. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618974 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-19 20:41:15 +00:00
Allen Wittenauer
31467453ec HADOOP-9902. Shell script rewrite (aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618847 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-19 12:11:17 +00:00
Andrew Wang
0cc08f6da4 Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618700 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:41:31 +00:00
Karthik Kambatla
73325f23f6 MAPREDUCE-6012. DBInputSplit creates invalid ranges on Oracle. (Wei Yan via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618694 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:25:50 +00:00
Jason Darrell Lowe
d51f81c3b6 MAPREDUCE-6036. TestJobEndNotifier fails intermittently in branch-2. Contributed by chang li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618691 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:18:22 +00:00
Zhijie Shen
f8e871d01b MAPREDUCE-6024. Shortened the time when Fetcher is stuck in retrying before concluding the failure by configuration. Contributed by Yunjiong Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618677 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 17:57:48 +00:00
Eric Yang
08d6201b34 MAPREDUCE-6033. Updated access check for displaying job information 
(Yu Gao via Eric Yang)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618648 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 16:13:56 +00:00
Zhijie Shen
ddf108449d MAPREDUCE-6032. Fix the non-unicode character in the change log in CHANGES.txt. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618270 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 20:25:51 +00:00
Zhijie Shen
84bc2fe402 MAPREDUCE-6032. Made MR jobs write job history files on the default FS when the current context’s FS is different. Contributed by Benjamin Zhitomirsky. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618269 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 20:17:45 +00:00
Allen Wittenauer
31e478905a Wrong categorization for a variety of commits in the CHANGES.txt files 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618233 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 16:47:34 +00:00
Sean Zhong
6d39367f6a MAPREDUCE-6025: distribute nativetask.so to right folder (Manu Zhang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1618120 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 08:55:49 +00:00
Jason Darrell Lowe
7378af7bca MAPREDUCE-5878. some standard JDK APIs are not part of system classes defaults. Contributed by Sangjin Lee 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618080 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 23:17:33 +00:00
Allen Wittenauer
2d904b3fa3 MAPREDUCE-5906. Inconsistent configuration in property "mapreduce.reduce.shuffle.input.buffer.percent" (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618007 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 18:07:06 +00:00
Allen Wittenauer
e1f15d2cdf MAPREDUCE-5999. Fix dead link in InputFormat javadoc (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618003 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 17:56:53 +00:00
Allen Wittenauer
7557f7bb2d MAPREDUCE-5998. CompositeInputFormat javadoc is broken (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617995 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 17:18:14 +00:00
Allen Wittenauer
6be98091f7 MAPREDUCE-5950. incorrect description in distcp2 document (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617994 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 17:11:39 +00:00
Allen Wittenauer
92054f2a06 MAPREDUCE-5597. Missing alternatives in javadocs for deprecated constructors in mapreduce.Job (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617986 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 16:00:18 +00:00
Jason Darrell Lowe
9579554988 MAPREDUCE-6010. HistoryServerFileSystemStateStore fails to update tokens. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617984 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 15:55:03 +00:00
Allen Wittenauer
e7b540eced MAPREDUCE-5363. Fix doc and spelling for TaskCompletionEvent#getTaskStatus and getStatus (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617982 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 15:49:10 +00:00
Allen Wittenauer
1e016e6451 MAPREDUCE-4791. Javadoc for KeyValueTextInputFormat should include default separator and how to change it (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617979 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 15:43:28 +00:00
Allen Wittenauer
b3df973adb MAPREDUCE-883. harchive: Document how to unarchive (Akira AJISAKA and Koji Noguchi via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617977 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 15:39:52 +00:00
Todd Lipcon
eace4dd50b MAPREDUCE-6035. native-task: sources/test-sources jar distribution. Contributed by Manu Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1617879 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 04:56:43 +00:00
Todd Lipcon
808bf8bac1 MAPREDUCE-6026. native-task: fix logging. Contributed by Manu Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1617878 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 04:53:36 +00:00
Todd Lipcon
886338ff80 MAPREDUCE-6006. native-task: add native tests to maven and fix bug in pom.xml. Contributed by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1617877 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 04:47:20 +00:00
Allen Wittenauer
e51a5d691b MAPREDUCE-5943. Separate mapred commands from CommandManual.apt.vm (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617806 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 19:34:26 +00:00
Allen Wittenauer
cc93c1fd75 MAPREDUCE-5944. Remove MRv1 commands from CommandsManual.apt.vm (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617804 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 19:18:50 +00:00
Charles Lamb
74f7be0887 merge from trunk r1617527 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617532 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 17:02:07 +00:00
Xuan Gong
eeb4acd955 YARN-2212: ApplicationMaster needs to find a way to update the AMRMToken periodically. Contributed by Xuan Gong 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616892 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 21:38:24 +00:00
Charles Lamb
041b8326a1 MAPREDUCE-6007. Add support to distcp to preserve raw.* namespace extended attributes. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616657 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 01:32:18 +00:00
Andrew Wang
311d2f0773 Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616589 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 20:26:52 +00:00
Jason Darrell Lowe
de2595833c MAPREDUCE-6021. MR AM should have working directory in LD_LIBRARY_PATH. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616585 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 20:15:56 +00:00
Sean Zhong
4d4fb1723f MAPREDUCE-5978. native-task: remove test case for not supported codec Bzip2Codec and DefaultCodec (Manu Zhang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1616116 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 07:40:24 +00:00
Sean Zhong
432f641bc2 MAPREDUCE-5976. native-task: should not fail to build if snappy is missing (Manu Zhang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1616115 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 07:32:49 +00:00
Binglin Chang
7ecaa81d27 MAPREDUCE-5984. native-task: Reuse lz4 sources in hadoop-common. Contributed by Binglin Chang 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1616105 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 06:01:12 +00:00
Jason Darrell Lowe
857d134fda MAPREDUCE-6014. New task status field in task attempts table can lead to an empty web page. Contributed by Mit Desai 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616018 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 21:52:22 +00:00
Andrew Wang
ac73d416f3 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615844 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 02:30:54 +00:00
Binglin Chang
83a396733e MAPREDUCE-6005. native-task: Fix some valgrind errors (Binglin Chang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1615489 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 06:19:51 +00:00
Xuan Gong
e52f67e389 YARN-1994. Expose YARN/MR endpoints on multiple interfaces. Contributed by Craig Welch, Milan Potocnik,and Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614981 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-31 20:06:02 +00:00
Zhijie Shen
1d6e178144 YARN-2347. Consolidated RMStateVersion and NMDBSchemaVersion into Version in yarn-server-common. Contributed by Junping Du. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614838 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-31 09:27:43 +00:00
Todd Lipcon
78d86a9839 MAPREDUCE-5995. native-task: Revert changes to Text internals. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613828 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-27 19:04:14 +00:00
Todd Lipcon
43917e564d Add entry to branch's CHANGES.txt for previous commit 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613827 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-27 18:54:02 +00:00
Charles Lamb
1d3e9ec935 merge from trunk r1613787 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1613788 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-27 13:32:51 +00:00
Zhijie Shen
549bcc2c02 MAPREDUCE-6002. Made MR task avoid reporting error to AM when the task process is shutting down. Contributed by Wangda Tan. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613743 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-27 01:37:51 +00:00
Binglin Chang
ea9e5b7baa MAPREDUCE-5991. native-task should not run unit tests if native profile is not enabled. Contributed by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613072 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 11:44:09 +00:00
Todd Lipcon
6635180324 MAPREDUCE-6000. native-task: Simplify ByteBufferDataReader/Writer. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613036 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 08:24:05 +00:00
Todd Lipcon
77acc70df5 MAPREDUCE-5997. native-task: Use DirectBufferPool from Hadoop Common. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613034 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 08:20:25 +00:00
Todd Lipcon
b2cba48f36 MAPREDUCE-5996. native-task: Rename system tests into standard directory layout. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613004 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 06:17:33 +00:00
Todd Lipcon
d468a92447 MAPREDUCE-5994. Simplify ByteUtils and fix failing test. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613003 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 06:14:27 +00:00
Andrew Wang
22ba00de60 Merge from trunk to branch pt 2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612941 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 20:45:10 +00:00
Todd Lipcon
341695e731 Merge trunk into branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1612742 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 01:47:28 +00:00
Todd Lipcon
e788e8b6ee MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by Binglin Chang 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1612659 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 19:55:03 +00:00
Jason Darrell Lowe
60b1e835e0 MAPREDUCE-5963. ShuffleHandler DB schema should be versioned with compatible/incompatible changes. Contributed by Junping Du 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612652 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 19:22:24 +00:00
Andrew Wang
cb20bb6117 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612403 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 21:44:50 +00:00
Jason Darrell Lowe
c2174a5536 MAPREDUCE-5756. CombineFileInputFormat.getSplits() including directories in its results. Contributed by Jason Dere 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612400 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 21:24:15 +00:00
Jason Darrell Lowe
9e62bcca4e MAPREDUCE-5957. AM throws ClassNotFoundException with job classloader enabled if custom output format/committer is used. Contributed by Sangjin Lee 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612358 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 17:54:46 +00:00
Jian He
875592220f MAPREDUCE-5910. Make MR AM resync with RM in case of work-preserving RM-restart. Contributed by Rohith 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611434 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-17 18:46:20 +00:00
Todd Lipcon
b2551c06a0 Import initial code for MAPREDUCE-2841 (native output collector) 
Contributed by:
  Binglin Chang
  Yang Dong
  Sean Zhong
  Manu Zhang
  Zhongliang Zhu
  Vincent Wang
  Yan Dong
  Cheng Lian
  Xusen Yin
  Fangqin Dai
  Jiang Weihua
  Gansha Wu
  Avik Dey


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1611413 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-17 17:44:55 +00:00
Andrew Wang
e8a1ff7efe MAPREDUCE-5971. Move the default options for distcp -p to DistCpOptionSwitch. Contributed by Charles Lamb. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611217 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-16 23:42:34 +00:00
Karthik Kambatla
43a12f3c01 MAPREDUCE-5952. LocalContainerLauncher#renameMapOutputForReduce incorrectly assumes a single dir for mapOutIndex. (Gera Shegalov via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611196 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-16 21:24:51 +00:00
Vinayakumar B
dc31d66f8a HADOOP-9921. daemon scripts should remove pid file on stop call after stop or process is found not running ( Contributed by Vinayakumar B) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610964 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-16 10:48:15 +00:00