Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,194 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

74 Commits

Author SHA1 Message Date
Junping Du dfac95a3a2 Preparing for 2.8.1 development 2017-04-11 11:21:49 -07:00
Junping Du 7706a63fb4 Preparing for 2.8.1 development after cutting off 2.8.0 branch. 2017-01-10 18:03:51 -08:00
Akira Ajisaka a8cfcce542 Revert "HADOOP-10465. Fix use of generics within SortedMapWritable. Contributed by Bertrand Dechoux." 
This reverts commit 1d175f0f3f.
 2016-07-09 21:01:07 -07:00
Akira Ajisaka 68cd8112e7 MAPREDUCE-6543. Migrate MR client test cases part 2. Contributed by Dustin Cote. 
(cherry picked from commit 0050fa5f1c)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java

(cherry picked from commit 7b2cf29f4f)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java
 2016-03-29 18:24:22 +09:00
Akira Ajisaka 0286ac2576 Revert "MAPREDUCE-6543. Migrate MR client test cases part 2. Contributed by Dustin Cote." 
This reverts commit 416ea158c2.
 2016-03-28 16:06:10 +09:00
Akira Ajisaka 416ea158c2 MAPREDUCE-6543. Migrate MR client test cases part 2. Contributed by Dustin Cote. 
(cherry picked from commit 2c268cc936)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java

(cherry picked from commit 0dc1453626)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java
 2016-03-25 15:33:01 +09:00
cnauroth ced22ca78f MAPREDUCE-6563. Streaming documentation contains a stray % character. Contributed by Chris Nauroth. 
(cherry picked from commit 41da9a0773)

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt

(cherry picked from commit bd01fdb64d)
 2016-01-28 14:47:03 -08:00
Akira Ajisaka d228bf1de3 HADOOP-12731. Remove useless boxing/unboxing code. Contributed by Kousuke Saruta. 
(cherry picked from commit 736eb17a79)
(cherry picked from commit 4edd7bd820)
 2016-01-25 13:48:46 +09:00
Akira Ajisaka 2097016ab1 HADOOP-12730. Hadoop streaming -mapper and -reducer options are wrongly documented as required. Contributed by Kengo Seki. 
(cherry picked from commit 0bae506c22)
(cherry picked from commit 6368d102b9)
 2016-01-22 21:09:23 +09:00
Haohui Mai 1d175f0f3f HADOOP-10465. Fix use of generics within SortedMapWritable. Contributed by Bertrand Dechoux. 2015-11-22 18:12:53 -08:00
Haohui Mai ee04add696 HDFS-9167. Update pom.xml in other modules to depend on hdfs-client instead of hdfs. Contributed by Mingliang Liu. 2015-10-13 15:24:29 -07:00
Harsh J 38420754f5 MAPREDUCE-5045. UtilTest#isCygwin method appears to be unused. Contributed by Neelesh Srinivas Salian. 
(cherry picked from commit de1322aa76007832698af682a3b76042116043b9)
 2015-09-22 21:38:31 +05:30
Robert Kanter ee3002933a MAPREDUCE-5965. Hadoop streaming throws error if list of input files is high. Error is: "error=7, Argument list too long at if number of input file is high" (wilfreds via rkanter) 
(cherry picked from commit cc70df98e7)
 2015-06-03 18:42:16 -07:00
Colin Patrick Mccabe 3dec58dd78 HADOOP-11969. ThreadLocal initialization in several classes is not thread safe (Sean Busbey via Colin P. McCabe) 
(cherry picked from commit 7dba7005b7)
 2015-05-26 12:40:41 -07:00
Harsh J d85c14afbf MAPREDUCE-579. Streaming slowmatch documentation. 
(cherry picked from commit a2e42d2deee715f6255d6fd2c95f34e80888dc5f)
 2015-03-25 14:39:46 +05:30
Tsuyoshi Ozawa 4489a02634 HADOOP-11558. Fix dead links to doc of hadoop-tools. Contributed by Jean-Pierre Matsumoto. 
(cherry picked from commit 79426f3334)
 2015-03-15 14:30:12 +09:00
Tsuyoshi Ozawa 1802df8373 Revert "HADOOP-11558. Fix dead links to doc of hadoop-tools. Contributed by Masatake Iwasaki." 
This reverts commit 54a73a6b5f.
 2015-03-15 14:27:56 +09:00
Tsuyoshi Ozawa 54a73a6b5f HADOOP-11558. Fix dead links to doc of hadoop-tools. Contributed by Masatake Iwasaki. 
(cherry picked from commit 7da136ecca)
 2015-03-15 14:18:01 +09:00
Haohui Mai e75e6c66ea HADOOP-11633. Convert remaining branch-2 .apt.vm files to markdown. Contributed by Masatake Iwasaki. 2015-03-11 14:23:44 -07:00
Tsuyoshi Ozawa b46f9e72db HADOOP-11602. Backport 'Fix toUpperCase/toLowerCase to use Locale.ENGLISH.' (ozawa) 2015-03-09 19:53:55 +09:00
Vinod Kumar Vavilapalli d9416317a9 Preparing for 2.8.0 development. Changing SNAPSHOT version to be 2.8 on branch-2. 2015-03-08 20:32:51 -07:00
Akira Ajisaka f7a724ca9e HADOOP-10976. Backport "moving the source code of hadoop-tools docs to the directory under hadoop-tools" to branch-2. Contributed by Masatake Iwasaki. 
(cherry picked from commit 9112f093cd)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-02-28 17:06:58 -08:00
Haohui Mai 1b8b51704a HADOOP-11367. Fix warnings from findbugs 3.0 in hadoop-streaming. Contributed by Li Lu. 2014-12-09 10:42:17 -08:00
Arun C. Murthy adfb830a2b Preparing to release hadoop-2.6.0: Set version in branch-2 to 2.7.0-SNAPSHOT. 2014-11-09 19:19:02 -08:00
Haohui Mai 5e5585a7e0 HADOOP-11253. Hadoop streaming test TestStreamXmlMultipleRecords fails on Windows. Contributed by Varun Vasudev. 2014-10-31 11:54:18 -07:00
Kihwal Lee 45b6dea95f MAPREDUCE-6022. map_input_file is missing from streaming job 
environment. Contributed by Jason Lowe.
(cherry picked from commit b056048114)
 2014-10-29 12:30:08 -05:00
Allen Wittenauer 5f6129feb4 HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) 2014-09-19 11:32:00 -07:00
Karthik Kambatla 9133e3142c Preparing for 2.6.0 development. Updated versions. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 06:11:57 +00:00
Jason Darrell Lowe b6988521f4 Reverted HADOOP-10474 from branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596048 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 20:31:40 +00:00
Jason Darrell Lowe fb22c7c52f Reverting HADOOP-10485 from branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596041 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 20:13:14 +00:00
Chris Nauroth f0d3664d83 MAPREDUCE-5852. Merging change r1589006 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589007 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 23:49:28 +00:00
Haohui Mai 11a6feb8d3 HADOOP-10485. Merge r1586059 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586060 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 18:12:17 +00:00
Haohui Mai 56268ffc41 HADOOP-10474. Merge r1585886 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585887 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 04:10:23 +00:00
Vinod Kumar Vavilapalli 8753d10405 MAPREDUCE-5810. Removed the faulty and failing streaming test TestStreamingTaskLog. Contributed by Akira Ajisaka. 
svn merge --ignore-ancestry -c 1582896 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582897 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 22:17:44 +00:00
Jing Zhao d611f42c37 Merge r1578669 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578676 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-18 00:10:22 +00:00
Arun Murthy 1ccccb8534 Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 04:41:01 +00:00
Steve Loughran 9c2534506f HADOOP-9611 mvn-rpmbuild against google-guice > 3.0 yields missing cglib dependency 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551915 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-18 11:14:30 +00:00
Arun Murthy 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-02 19:40:42 +00:00
Steve Loughran a7bfe3efe3 MAPREDUCE-6524 Move grizzly-test and junit dependencies to test scope 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541699 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-13 20:43:04 +00:00
Sanford Ryza 5c20de6ac3 MAPREDUCE-5457. Add a KeyOnlyTextOutputReader to enable streaming to write out text files without separators (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533626 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-18 20:46:05 +00:00
Chris Nauroth 4e4e958213 HADOOP-10040. Merging change r1531977 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531978 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-14 17:06:42 +00:00
Chris Nauroth 4f3386420c HADOOP-10040. Merging change r1531491 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531492 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-12 03:16:45 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-19 01:35:34 +00:00
Arun Murthy 27ed92a3fb Set version in branch-2 to 2.2.0-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 15:34:52 +00:00
Siddharth Seth f42fc8f958 merge YARN-720 and MAPREDUCE-5291 from trunk. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488830 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 02:36:44 +00:00
Konstantin Boudnik 6e0b55c5b7 Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:41 +00:00
Suresh Srinivas 1a895a3fd6 HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 22:29:49 +00:00
Suresh Srinivas 91084635f3 MAPREDUCE-4885. Merge r1467158 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485951 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 07:12:07 +00:00
Suresh Srinivas a1235b5ba9 HADOOP-8562. Merge r1453486 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 20:41:53 +00:00
Alejandro Abdelnur a7d2d7cfc7 MAPREDUCE-5113. Streaming input/output types are ignored with java mapper/reducer. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466870 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 13:04:29 +00:00