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

242 Commits

Author SHA1 Message Date
Alejandro Abdelnur 09a0ad328f HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu) 
(cherry picked from commit 189abddf0b68ab43978dacaf3a9bf6ee7169cf78)
 2014-08-29 11:53:13 -07:00
Alejandro Abdelnur 54202383a9 HADOOP-10911. hadoop.auth cookie after HADOOP-10710 still not proper according to RFC2109. (gchanan via tucu) 
(cherry picked from commit 6040810df82669f140033d3c6366892640798671)

Conflicts:
	hadoop-project/pom.xml
 2014-08-29 11:23:14 -07:00
Alejandro Abdelnur c77bd85b62 HDFS-6134 and HADOOP-10150 subtasks. 2014-08-28 15:03:08 -07:00
Colin Patrick Mccabe f1ee8cec61 HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki. 
(cherry picked from commit 6962510f72)
 2014-08-27 14:17:29 -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
Alejandro Abdelnur 7a07873c28 HADOOP-10141. Create KeyProvider API to separate encryption key storage 
from the applications. (omalley)


Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619506 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:58:24 +00:00
Allen Wittenauer 178c37bd0d YARN-2197. Add a link to YARN CHANGES.txt in the left side of doc (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618069 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 21:48:27 +00:00
Allen Wittenauer 93e518be3a MAPREDUCE-5943. Separate mapred commands from CommandManual.apt.vm (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617807 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 19:36:08 +00:00
Alejandro Abdelnur 481ac00c65 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616674 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 05:01:12 +00:00
Arpit Agarwal 3f54884b46 HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616576 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 19:46:14 +00:00
Steve Loughran 432e5eef56 HDFS-4629. Using com.sun.org.apache.xml.internal.serialize.* in XmlEditsVisitor.java is JVM vendor specific. Breaks IBM JAVA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614664 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 14:06:05 +00:00
Karthik Kambatla 5817f7ce5b HADOOP-10821. Prepare the release notes for Hadoop 2.5.0. (Andrew Wang and Karthik Kambatla via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614232 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-29 00:47:57 +00:00
Arpit Agarwal 32e9ab8341 HDFS-6712: Merging r1612695 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612696 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 20:33:07 +00:00
Arpit Agarwal 73d109304d HADOOP-10864: Merging r1612609 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612610 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 16:57:48 +00:00
Steve Loughran 4a97dec701 HADOOP-10801 dead link in site.xml 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609093 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-09 10:56:32 +00:00
Uma Maheswara Rao G 5b832979e1 Mreged from trunk. HDFS-5411. Update Bookkeeper dependency to 4.2.3. Contributed by Rakesh R. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608784 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-08 13:53:42 +00:00
Steve Loughran 6441c4c626 HADOOP-9361: site and gitignore 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607626 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 12:56:17 +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
Alejandro Abdelnur 602d3dd926 HADOOP-10711. Cleanup some extra dependencies from hadoop-auth. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603645 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 21:50:49 +00:00
Arpit Agarwal e6d729c27c HADOOP-6350: Merging r1602324 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602325 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 02:56:47 +00:00
Uma Maheswara Rao G 6eb03a41cb Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601992 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 19:25:17 +00:00
Chris Nauroth 74a6db7b27 HADOOP-9555. Merging change r1601709 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601713 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 18:05:22 +00:00
Ravi Prakash 2125caaa2f MAPREDUCE 5874. Creating MapReduce REST API section. Contributed by Tsuyoshi Ozawa 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595268 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 17:11:01 +00:00
Jonathan Turner Eagles 7ac359f389 MAPREDUCE-5636. Convert MapReduce Tutorial document to APT (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592796 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 16:18:13 +00:00
Jonathan Turner Eagles 72feaf0436 MAPREDUCE-5637. Convert Hadoop Streaming document to APT (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592792 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 16:05:37 +00:00
Vinod Kumar Vavilapalli 0a914b61e0 YARN-1696. Added documentation for ResourceManager fail-over. Contributed by Karthik Kambatla, Masatake Iwasaki, Tsuyoshi OZAWA. 
svn merge --ignore-ancestry -c 1591416 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591417 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-30 18:01:05 +00:00
Jonathan Turner Eagles 73e0b8e55a MAPREDUCE-5638. Port Hadoop Archives document to trunk (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591108 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 21:27:14 +00:00
Jonathan Turner Eagles e0cd544a53 MAPREDUCE-5639. Port DistCp2 document to trunk (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590131 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 20:32:09 +00:00
Chris Nauroth 8296b7e3cc HADOOP-10503. Merging change r1589273 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589275 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-22 19:58:02 +00:00
Steve Loughran 770aef5053 HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585933 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 11:11:31 +00:00
Jian He ce4d860308 Merge r1582913 from trunk. YARN-1017. Added documentation for ResourceManager Restart.(jianhe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582917 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 23:41:44 +00:00
Vinod Kumar Vavilapalli 4c91a402f5 YARN-1452. Added documentation about the configuration and usage of generic application history and the timeline data service. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1581656 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581657 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 02:54:00 +00:00
Tsz-wo Sze e3acf75912 svn merge -c 1580013 from trunk for merging site.xml (missing from previous commit) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580018 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-21 18:50:57 +00:00
Jing Zhao 6aa3081681 HDFS-6131. Move HDFSHighAvailabilityWithNFS.apt.vm and HDFSHighAvailabilityWithQJM.apt.vm from Yarn to HDFS. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579736 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-20 21:03:42 +00:00
Tsz-wo Sze 134a29f226 svn merge -c 1574259 from trunk for HDFS-5535. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576128 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-10 23:37:46 +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
Zhijie Shen c9b6c3c36c YARN-1635. Implemented a Leveldb based ApplicationTimelineStore. Contributed by Billie Rinaldi. 
svn merge --ignore-ancestry -c 1565868 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565869 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-08 02:18:06 +00:00
Arpit Agarwal 152f1b17c6 HADOOP-9830. Merging r1561951 from trunk to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561952 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 06:42:51 +00:00
Arpit Agarwal be32b2d1ad HADOOP-10086. Merging r1561776 from trunk to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561777 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-27 18:36:07 +00:00
Konstantin Boudnik f3136cd6b9 HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / refactoring. Contributed by Mikhail Antonov. 
Conflicts:

	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560832 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-23 22:31:27 +00:00
Andrew Wang c4194399d3 Merge HDFS-4949 changes from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560522 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-22 21:43:00 +00:00
Alejandro Abdelnur b9623c6308 HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559231 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-17 19:31:01 +00:00
Vinod Kumar Vavilapalli f35f702426 YARN-888. Cleaned up POM files so that non-leaf modules don't include any dependencies and thus compact the dependency list for leaf modules. Contributed by Alejandro Abdelnur. 
svn merge --ignore-ancestry -c 1557801 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557802 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-13 18:34:39 +00:00
Steve Loughran b8eb777a43 HADOOP-10147 HDFS-5678 Upgrade to commons-logging 1.1.3 to avoid potential deadlock in MiniDFSCluster 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554802 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-02 13:37:04 +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
Steve Loughran fb03925549 HADOOP-10102. Update commons IO from 2.1 to 2.4 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547755 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-04 10:39:36 +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 92d615a37a HADOOP-10103 commons-lang->2.6 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544173 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-21 13:36:59 +00:00
Steve Loughran 2d39336213 HADOOP-10067 Missing POM dependency on jsr305 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541861 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-14 09:42:35 +00:00
Steve Loughran 91342b9820 HADOOP-9594 commons-math 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541667 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-13 19:29:56 +00:00
Colin McCabe 60dd68f4bb HADOOP-9623. Update jet3t dependency to 0.9.0 (Amandeep Khurana via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539256 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-06 08:02:55 +00:00
Brandon Li fcc912838d HDFS-5347. Merging change r1534377 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534379 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-21 21:20:35 +00:00
Todd Lipcon 1c48b4d04c HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector. Contributed by Todd Lipcon 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528292 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-02 00:44:43 +00:00
Jason Darrell Lowe 7e812e7126 svn merge -c 1528237 FIXES: MAPREDUCE-4421. Run MapReduce framework via the distributed cache. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528242 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-01 22:40:01 +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
Steve Loughran d44334158a HADOOP-8545. Filesystem Implementation for OpenStack Swift 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526848 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 11:12:42 +00:00
Sanford Ryza d2e94731ee HADOOP-9976. Different versions of avro and avro-maven-plugin (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526668 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 20:26:04 +00:00
Chris Nauroth b52ae58928 HADOOP-9935. Revert from branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523835 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 23:12:01 +00:00
Alejandro Abdelnur 3638f42a50 HADOOP-9962. in order to avoid dependency divergence within Hadoop itself lets enable DependencyConvergence. (rvs via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523600 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 11:41:00 +00:00
Alejandro Abdelnur 89df2ae5c9 HADOOP-9961. versions of a few transitive dependencies diverged between hadoop subprojects. (rvs via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523597 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 11:31:17 +00:00
Chris Nauroth c2a1353c29 HADOOP-9935. Merging change r1523403 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523404 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-15 04:40:54 +00:00
Aaron Myers 6a193d7f8e HADOOP-9960. Upgrade Jersey version to 1.9. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523156 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-14 00:15:07 +00:00
Chris Nauroth 4c66560499 HDFS-4491. Merging change r1520479 and r1520482 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520485 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-06 03:28:00 +00:00
Sanford Ryza 11123a1b26 HADOOP-9879. Move the version info of zookeeper dependencies to hadoop-project/pom (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515713 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 06:29:34 +00:00
Alejandro Abdelnur eee2b37a3a HADOOP-9872. Improve protoc version handling and detection. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514074 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:29:46 +00:00
Alejandro Abdelnur 677bbd336d HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514071 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:25:26 +00:00
Alejandro Abdelnur 5b9536d368 HADOOP-9848. Create a MiniKDC for use with security testing. (ywskycn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513309 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-13 00:27:59 +00:00
Chris Nauroth 086934cd59 HADOOP-9802. Merging change r1512872 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512874 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-11 06:05:34 +00:00
Chris Nauroth a6c58bc850 HADOOP-9857. Merging change r1512522 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512523 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-09 23:00:08 +00:00
Kihwal Lee d90f3fbdbf svn merge -c 1512314 from trunk to branch-2 to fix HADOOP-9672. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512315 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-09 14:15:30 +00:00
Steve Loughran 16810177c9 merge r1512026: HADOOP-9833 move slf4j to version 1.7.5 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512048 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-08 21:32:01 +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
Brandon Li 07a08e2941 HDFS-4762,HDFS-4948. Merging change r1499029,r1499041,r1499152 from trunk to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499190 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-03 03:55:42 +00:00
Arun Murthy a37125a531 Merge -c 1493693 from trunk to branch-2 to fix HADOOP-9517. Documented various aspects of compatibility for Apache Hadoop. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493694 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 09:33:14 +00:00
Arun Murthy 51bb83eabf Merge -c 1493570 from trunk to branch-2 to fix MAPREDUCE-5184. Document compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493571 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-16 19:10:32 +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
Jason Darrell Lowe eb7af141e4 HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489250 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 00:29:37 +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
Tsz-wo Sze 82f91de0b6 Merge r1480838 and r1480840 from trunk for merging HDFS Snapshot feature. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488089 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:29:20 +00:00
Konstantin Boudnik d1d9252059 HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487982 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 19:14:26 +00:00
Suresh Srinivas 3694a73ff8 HADOOP-9290. Merge r1476586 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:37:58 +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
Todd Lipcon 87a1e92453 HDFS-347. DFS read performance suboptimal when client co-located on nodes with data. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483209 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 07:02:57 +00:00
Alejandro Abdelnur 886b5b6756 HADOOP-9550. Remove aspectj dependency. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480784 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-09 21:29:25 +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
Alejandro Abdelnur a29d7b00c9 HADOOP-9406. hadoop-client leaks dependency on JDK tools jar. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456730 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-15 00:28:27 +00:00
Suresh Srinivas 434388ff63 HADOOP-9407. Merge 1456704 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456705 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-14 22:35:12 +00:00
Suresh Srinivas 6485664b15 HADOOP-9334. Merge change 1450463 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450475 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-26 22:02:30 +00:00
Alejandro Abdelnur 2d35d0063a HADOOP-8924. Add maven plugin alternative to shell script to save package-info.java. Contributed by Alejandro Abdelnur and Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446018 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-14 01:30:50 +00:00
Thomas Graves ecfd15693e HADOOP-9302. HDFS docs not linked from top level (Andy Isaacson via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445648 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-13 15:05:21 +00:00
Alejandro Abdelnur f5503bd44a MAPREDUCE-4977. Documentation for pluggable shuffle and pluggable sort. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443170 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 19:53:06 +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
Alejandro Abdelnur 7194c52ec3 HADOOP-8427. Convert Forrest docs to APT, incremental. (adi2 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425527 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-23 21:15:42 +00:00
Todd Lipcon fd032dd9e3 Merge HDFS-3077 (QuorumJournalManager) backport into branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1417596 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-05 19:22:17 +00:00
Thomas White db8545d924 Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify classpath construction for mini YARN tests. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411239 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-19 15:16:57 +00:00
Thomas White d488a59497 Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408290 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-12 13:57:19 +00:00
Alejandro Abdelnur 60cd4f4c7a reverting commit 1399959 (HADOOP-8887 again) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399971 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-19 05:30:30 +00:00
Alejandro Abdelnur c6f60985a8 HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399959 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-19 03:59:39 +00:00
Suresh Srinivas a2b01168e2 HDFS-8887 reverting commit r1399904 due to build failure and other issues 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399949 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-19 02:22:24 +00:00