Commit Graph

180 Commits

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