Commit Graph

62 Commits

Author SHA1 Message Date
Andrew Wang 5f46076f2b MAPREDUCE-6537. Include hadoop-pipes examples in the release tarball. Contributed by Kai Sasaki.
(cherry picked from commit 9e8411d0a6)
2016-05-02 15:35:08 -07:00
Vinod Kumar Vavilapalli b20e77eba3 Preparing for 2.9.0 development: mvn versions:set -DnewVersion=2.9.0 2015-11-25 17:47:22 -08:00
Karthik Kambatla 999aa22509 MAPREDUCE-6415. Create a tool to combine aggregated logs into HAR files. (Robert Kanter via kasha) 2015-09-09 17:49:23 -07: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
Steve Loughran 275561d848 HADOOP-10530 Make hadoop build on Java7+ only (stevel) 2014-12-08 15:30:34 +00: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
Karthik Kambatla 9855e884cb HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha)
(cherry picked from commit ce0462129f)
2014-09-03 09:39:32 -07:00
Alejandro Abdelnur d637c71e4d HADOOP-10433. Key Management Server based on KeyProvider API. (tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-project/pom.xml

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619518 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:53 +00: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
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
Vinod Kumar Vavilapalli 8b6b88f0fa YARN-1242. Changed yarn scripts to be able to start ApplicationHistoryServer as an individual process. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1556744 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562199 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:58:40 +00:00
Alejandro Abdelnur e1595527c0 YARN-1601. 3rd party JARs are missing from hadoop-dist output. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558466 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 17:01:03 +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
Alejandro Abdelnur 75f9db1c4d YARN-1021. Yarn Scheduler Load Simulator. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527065 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:32:06 +00:00
Brandon Li 992a046b89 HDFS-5069. Merging change r1516232 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516239 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 18:17:23 +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
Chris Nauroth fd159ded9b MAPREDUCE-5187. Merging change r1500929 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500930 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 20:28:55 +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
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 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
Thomas Graves 0a4857fef3 HADOOP-9469. mapreduce/yarn source jars not included in dist tarball Robert Parker via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470059 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 21:59:31 +00:00
Arun Murthy 91a676fc41 Setting version in branch-2 to be 2.0.5-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 03:16:30 +00:00
Hitesh Shah d6481d4a60 merge -c 1453501 from trunk to branch-2 to fix YARN-429. capacity-scheduler config missing from yarn-test artifact. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453502 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 19:29:12 +00:00
Arun Murthy 196341fc09 Setting version to 2.0.4-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 13:23:45 +00:00
Jason Darrell Lowe 7126958734 svn merge -c 1442639 FIXES: HADOOP-9260. Hadoop version may be not correct when starting name node or data node. Contributed by Chris Nauroth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442641 13f79535-47bb-0310-9956-ffa450edef68
2013-02-05 16:06:58 +00:00
Vinod Kumar Vavilapalli e49fb14997 YARN-181. Fixed eclipse settings broken by capacity-scheduler.xml move via YARN-140. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1401504 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401508 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 22:49:37 +00:00
Arun Murthy f403be7569 Set version in branch-2 to 2.0.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 12:57:48 +00:00
Arun Murthy 92a99de731 Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370667 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 05:33:56 +00:00
Alejandro Abdelnur 2a178a8d0b Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369908 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 18:15:35 +00:00
Aaron Myers 477a0dcc64 HDFS-3720. hdfs.h must get packaged. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365763 13f79535-47bb-0310-9956-ffa450edef68
2012-07-25 21:22:00 +00:00
Alejandro Abdelnur 52fa40b8ba Merge -r 1363161:1363162 from trunk to branch. FIXES: MAPREDUCE-4407
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363163 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 22:43:52 +00:00
Thomas Graves 9e4b5f52ea merge -r 1357810:1357811 from trunk. FIXES: HADOOP-8563
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357813 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 19:14:13 +00:00
Eli Collins 0929846101 HADOOP-8547. Package hadoop-pipes examples/bin directory (again). Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356948 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 21:13:02 +00:00
Robert Joseph Evans c30a4d6a90 svn merge -c 1351818. FIXESL MAPREDUCE-4267. mavenize pipes (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351825 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 20:00:35 +00:00
Harsh J 1f804b5d20 svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:58:13 +00:00
Alejandro Abdelnur 00875b37f6 HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 19:46:30 +00:00
Robert Joseph Evans 8e3046a391 svn merge -c 1308925 from trunk. FIXES MAPREDUCE-4060. Multiple SLF4J binding warning (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308930 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 14:21:02 +00:00
Arun Murthy 3e8925aa92 Changed version in branch-2 to 2.0.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:25:51 +00:00
Arun Murthy c79ae7a8db Moving branch-0.23 to version 0.23.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293515 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:58:06 +00:00
Arun Murthy 78971a4267 Set version to 0.23.2-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241808 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 08:12:18 +00:00
Arun Murthy c6e7c24bde Merge -c 1241250 from trunk to branch-0.23 to fix MAPREDUCE-3354. Changed scripts so that jobhistory server is started by bin/mapred instead of bin/yarn. Contributed by Jonathan Eagles.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241252 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 23:13:16 +00:00
Mahadev Konar 75f8caf8d3 MAPREDUCE-3712. The mapreduce tar does not contain the hadoop-mapreduce-client-jobclient-tests.jar. (mahadev) - Merging r1235566 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235567 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 00:16:42 +00:00
Alejandro Abdelnur 6455f96ec6 Merge -r 1227967:1227968 from trunk to branch. FIXES: HADOOP-7936
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227969 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 06:00:08 +00:00
Alejandro Abdelnur b22d5dc992 Merge -r 1227900:1227901 from trunk to branch. FIXES: HADOOP-7907
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227905 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 00:17:54 +00:00
Alejandro Abdelnur e3e457398e Merge -r 1227786:1227787 from trunk to branch. FIXES: HADOOP-7934
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227805 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:06:52 +00:00
Mahadev Konar e0657fb161 MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev) - Merging r1215065 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215066 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 09:17:00 +00:00
Alejandro Abdelnur 24e3d83445 Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212064 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 19:30:53 +00:00
Alejandro Abdelnur 9a8cc9cc0c Merge -r 1208927:1208928 from trunk to branch. FIXES: HDFS-2614
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209163 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 17:29:18 +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
Alejandro Abdelnur 89d8dedfbe Merge -r 1183159:1183160 from trunk to branch. FIXES: MAPREDUCE-3183
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190639 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 22:29:43 +00:00