Aaron T. Myers
a0c54aeb00
HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang.
2014-09-15 08:30:42 -07:00
Colin Patrick Mccabe
5e4cb3d04c
HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe)
...
(cherry picked from commit 5ec7fcd9dd
)
2014-09-11 15:00:47 -07:00
Steve Loughran
fb804ed46c
HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel)
...
(cherry picked from commit 59384dfb71
)
2014-09-11 11:43:52 -07:00
Karthik Kambatla
05ae7983c6
HADOOP-11030. Define a variable jackson.version instead of using constant at multiple places. (Juan Yu via kasha)
...
(cherry picked from commit 9ad413b19d
)
2014-08-29 15:57:29 -07:00
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