big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,521 Commits 2 Branches 2 Tags 264 MiB
d777a1e4ca
Commit Graph

1919 Commits

Author SHA1 Message Date
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